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

Diff for /pegasus/TestMakefile between version 1.18 and 1.19

version 1.18, 2005/02/10 06:41:52 version 1.19, 2005/02/11 00:22:15
Line 1 
Line 1 
 include $(PEGASUS_ROOT)/mak/config.mak include $(PEGASUS_ROOT)/mak/config.mak
 include $(PEGASUS_ROOT)/mak/test.mak include $(PEGASUS_ROOT)/mak/test.mak
   include $(PEGASUS_ROOT)/mak/commands.mak
  
 system = localhost system = localhost
  
Line 18 
Line 19 
 ## ##
 ############################################################################### ###############################################################################
  
 ###############################################################################  
 ##  
 ## Platform specific settings for several platforms.  
 ##  
 ## NOTE: Please add platform specific environment variables as appropriate.  
 ##  
 ###############################################################################  
   
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)  
     CIMSERVER_START_SERVICE = cimserver -start  
     CIMSERVER_STOP_SERVICE = cimserver -stop  
     SLEEP = mu sleep 5  
     REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus  
     MUEXE = mu.exe  
     MKDIR = $(MUEXE) mkdirhier  
     TESTS = prestarttests poststarttests     TESTS = prestarttests poststarttests
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)  
     CIMSERVER_START_SERVICE = cimserver  
     CIMSERVER_STOP_SERVICE = cimserver -s; true  
     SLEEP = sleep 5  
     MUEXE = mu  
     MKDIR = $(MUEXE) mkdirhier  
     TESTS = prestarttests poststarttests  
 endif  
   
 ifeq ($(OS),HPUX)  
     CIMSERVER_START_SERVICE = cimserver  
     CIMSERVER_STOP_SERVICE = cimserver -s; true  
     SLEEP = sleep 5  
     MUEXE = mu  
     MKDIR = $(MUEXE) mkdirhier  
     TESTS = prestarttests poststarttests  
 endif  
   
 ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU  
     CIMSERVER_START_SERVICE = cimserver  
     CIMSERVER_STOP_SERVICE = cimserver -s; true  
     SLEEP = sleep 5  
     MUEXE = mu  
     MKDIR = $(MUEXE) mkdirhier  
     TESTS = prestarttests poststarttests  
 endif  
  
 error: error:
         @ $(ECHO) "Specify desired makefile option (i.e., build, rebuild)"         @ $(ECHO) "Specify desired makefile option (i.e., build, rebuild)"
  
 buildmu: buildmu:
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile
         $(MKDIR) $(BIN_DIR)          $(MKDIRHIER) $(BIN_DIR)
  
 rebuild: clean buildmu all rebuild: clean buildmu all
  
Line 87 
Line 45 
  
 repositoryServer: repositoryServer:
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
         $(SLEEP)          $(SLEEP) 5
         $(RMDIRHIER) $(REPOSITORY_ROOT)         $(RMDIRHIER) $(REPOSITORY_ROOT)
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(SLEEP)          $(SLEEP) 5
         $(MAKE) -f Makefile repositoryServer         $(MAKE) -f Makefile repositoryServer
         $(MAKE) -f Makefile testrepositoryServer         $(MAKE) -f Makefile testrepositoryServer
  
 prestarttests: prestarttests:
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
         $(SLEEP)          $(SLEEP) 5
         $(MAKE) -f Makefile repository         $(MAKE) -f Makefile repository
         $(MAKE) -f Makefile testrepository         $(MAKE) -f Makefile testrepository
         $(MAKE) -f Makefile tests         $(MAKE) -f Makefile tests
Line 107 
Line 65 
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Query/QueryExpression/tests/Queries -f Makefile clean         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Query/QueryExpression/tests/Queries -f Makefile clean
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile clean         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile clean
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(SLEEP)          $(SLEEP) 5
         $(MAKE) -f Makefile poststarttests         $(MAKE) -f Makefile poststarttests
  
 tests: $(TESTS) tests: $(TESTS)
Line 280 
Line 238 
  
 startcimWithoutSSL: startcimWithoutSSL:
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(SLEEP)          $(SLEEP) 5
  
 startcimWithSSL: startcimWithSSL:
         $(CIMSERVER_START_SERVICE) enableHttpConnection=false enableHttpsConnection=true         $(CIMSERVER_START_SERVICE) enableHttpConnection=false enableHttpsConnection=true
         $(SLEEP)          $(SLEEP) 5
  
 stopcim: stopcim:
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
         $(SLEEP)          $(SLEEP) 5
  
 rebuild: rebuild:
         $(MAKE) -f TestMakefile -i stopcim         $(MAKE) -f TestMakefile -i stopcim

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