(file) Return to TestMakefile CVS log (file) (dir) Up to [Pegasus] / pegasus

Diff for /pegasus/TestMakefile between version 1.5 and 1.6

version 1.5, 2003/05/28 20:47:28 version 1.6, 2003/06/06 19:55:28
Line 49 
Line 49 
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU) ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU)
   CIMSERVER_START_SERVICE = cimserver   CIMSERVER_START_SERVICE = cimserver
   CIMSERVER_STOP_SERVICE = /bin/ps -ef | /bin/grep cimserver | /bin/grep -v grep | /usr/bin/awk '{print "kill -9 "$$2 |"/bin/bash"}'    CIMSERVER_STOP_SERVICE = ps -ef | grep cimserver | grep -v grep | awk '{print "kill -9 "$$2 |"/bin/bash"}'
   SLEEP = sleep 5   SLEEP = sleep 5
   MUEXE = mu   MUEXE = mu
   COPYMU = cp -f src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)   COPYMU = cp -f src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)
Line 59 
Line 59 
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU) ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU)
   CIMSERVER_START_SERVICE = cimserver   CIMSERVER_START_SERVICE = cimserver
   CIMSERVER_STOP_SERVICE = /bin/ps -ef | /bin/grep cimserver | /bin/grep -v grep | /usr/bin/awk '{print "kill -9 "$$2 |"/bin/bash"}'    CIMSERVER_STOP_SERVICE = ps -ef | grep cimserver | grep -v grep | awk '{print "kill -9 "$$2 |"/bin/bash"}'
   SLEEP = sleep 5   SLEEP = sleep 5
   MUEXE = mu   MUEXE = mu
   COPYMU = cp -f src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)   COPYMU = cp -f src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)
Line 71 
Line 71 
         @ echo "Specify desired makefile option (i.e., build, rebuild)"         @ echo "Specify desired makefile option (i.e., build, rebuild)"
  
 buildmu: buildmu:
         $(MAKE) --directory=src/utils/mu -f Makefile          $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile
         $(MKDIR) $(BIN_DIR)         $(MKDIR) $(BIN_DIR)
         $(COPYMU)         $(COPYMU)
  
Line 84 
Line 84 
         $(MAKE)  -f Makefile all         $(MAKE)  -f Makefile all
  
 doc: doc:
         $(MAKE) --directory=doc/ProviderSpec -f Makefile          $(MAKE) --directory=$(PEGASUS_ROOT)/doc/ProviderSpec -f Makefile
         $(MAKE) --directory=doc/DevManual -f Makefile          $(MAKE) --directory=$(PEGASUS_ROOT)/doc/DevManual -f Makefile
  
 clean: clean:
         $(MAKE) -f Makefile clean         $(MAKE) -f Makefile clean
Line 105 
Line 105 
         $(MAKE) -f Makefile repository         $(MAKE) -f Makefile repository
         $(MAKE) -f Makefile testrepository         $(MAKE) -f Makefile testrepository
         $(MAKE) -f Makefile tests         $(MAKE) -f Makefile tests
         $(MAKE) --directory=src/Server -f Makefile install          $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install
  
 poststarttests: poststarttests:
         $(MAKE) --directory=test/wetest -f Makefile clean          $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile clean
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(SLEEP)         $(SLEEP)
         $(MAKE) -f Makefile poststarttests         $(MAKE) -f Makefile poststarttests
Line 116 
Line 116 
 tests: $(TESTS) tests: $(TESTS)
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC) ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
         $(MAKE) --directory=src/Server -f Makefile uninstall          $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile uninstall
 endif endif
         @ echo Finished Tests         @ echo Finished Tests
  

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2