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

Diff for /pegasus/TestMakefile between version 1.14 and 1.20

version 1.14, 2004/07/21 01:26:41 version 1.20, 2005/02/11 00:30:40
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 =  
   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
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run
  
 poststarttests: poststarttests:
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/CQL/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
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOP_TS1
  
 tests: $(TESTS) tests: $(TESTS)
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC) ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile uninstall         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile uninstall
 endif endif
         @ echo Finished Tests          @ $(ECHO) Finished Tests
   
   ###############################################################################
   ##  Test Suite Definitions
   ###############################################################################
   
   ###############################################################################
   ##  OOP Test Suite 1: "Out-of-Process"(OOP) Provider Tests
   ##
   ##  Configuration Options: forceProviderProcesses=true
   ##
   ###############################################################################
   OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true
   OOP_TS1_TEST_CMDS = \
           TestClient
   
   run_OOP_TS1:
           $(MAKE) -f $(PEGASUS_ROOT)/mak/commands.mak runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(OOP_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(OOP_TS1_TEST_CMDS)"
   ###############################################################################
  
 ############################################################################### ###############################################################################
 ## ##
Line 205 
Line 186 
 TestCimmof: TestCimmof:
         $(MAKE) -f Testcimmof poststarttests         $(MAKE) -f Testcimmof poststarttests
  
   
 RunTestClientLocal: RunTestClientLocal:
         TestClient -local         TestClient -local
  
Line 258 
Line 238 
         cimauth -a -u guest -n test1/test2/test3/test4/test5/test6 -R -W         cimauth -a -u guest -n test1/test2/test3/test4/test5/test6 -R -W
  
 startcimWithoutSSL: startcimWithoutSSL:
         cimserver          $(CIMSERVER_START_SERVICE)
         sleep 10          $(SLEEP) 5
  
 startcimWithSSL: startcimWithSSL:
         cimserver enableHttpConnection=false enableHttpsConnection=true          $(CIMSERVER_START_SERVICE) enableHttpConnection=false enableHttpsConnection=true
         sleep 10          $(SLEEP) 5
  
 stopcim: stopcim:
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
         sleep 5          $(SLEEP) 5
  
 rebuild: rebuild:
         $(MAKE) -f TestMakefile -i stopcim         $(MAKE) -f TestMakefile -i stopcim
Line 276 
Line 256 
  
 pegasus: pegasus:
         $(MAKE) -f Makefile rebuild         $(MAKE) -f Makefile rebuild
   

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