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

Diff for /pegasus/TestMakefile between version 1.4 and 1.6.2.1

version 1.4, 2002/09/17 05:51:47 version 1.6.2.1, 2003/06/25 16:29:06
Line 27 
Line 27 
 ############################################################################### ###############################################################################
  
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC) ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
   CIMSERVER_START_SERVICE = start cimserver    CIMSERVER_START_SERVICE = cimserver -start
   CIMSERVER_STOP_SERVICE =    CIMSERVER_STOP_SERVICE = cimserver -stop
   SLEEP =   SLEEP =
   REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus   REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus
   MUEXE = mu.exe   MUEXE = mu.exe
   COPYMU = copy src\utils\mu\$(MUEXE) /y $(MUEXE)   COPYMU = copy src\utils\mu\$(MUEXE) /y $(MUEXE)
   MKDIR = src/utils/mu/mu mkdirhier   MKDIR = src/utils/mu/mu mkdirhier
   TESTS = prestarttests    TESTS = prestarttests poststarttests
 endif endif
  
 ifeq ($(OS),HPUX) ifeq ($(OS),HPUX)
Line 47 
Line 47 
   TESTS = prestarttests poststarttests   TESTS = prestarttests poststarttests
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU)  ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
   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"}'  
   SLEEP = sleep 5  
   MUEXE = mu  
   COPYMU = cp -f src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)  
   MKDIR = src/utils/mu/mu mkdirhier  
   TESTS = prestarttests poststarttests  
 endif  
   
 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 61 
         @ 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 74 
         $(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 95 
         $(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
  
 tests: $(TESTS) tests: $(TESTS)
   ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
           $(CIMSERVER_STOP_SERVICE)
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile uninstall
   endif
         @ echo Finished Tests         @ echo Finished Tests
  
 ############################################################################### ###############################################################################

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