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

Diff for /pegasus/TestMakefile between version 1.24 and 1.27

version 1.24, 2005/02/15 17:52:55 version 1.27, 2005/03/12 01:32:35
Line 24 
Line 24 
  
 TESTS = prestarttests poststarttests TESTS = prestarttests poststarttests
  
 rebuild: clean all  rebuild: clean all tests
  
 build: all  build: all tests
  
 clean: clean:
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile clean         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile clean
Line 59 
Line 59 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile tests         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile tests
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/tests -f Makefile test_setup
  
 poststarttests: poststarttests:
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/CQL/tests/Queries -f Makefile clean         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/CQL/tests/Queries -f Makefile clean
Line 67 
Line 68 
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(SLEEP) 5         $(SLEEP) 5
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOP_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOP_TS1
  
 tests: $(TESTS) tests: $(TESTS)
Line 91 
Line 93 
         TestClient         TestClient
  
 run_OOP_TS1: run_OOP_TS1:
         $(MAKE) -f $(PEGASUS_ROOT)/mak/commands.mak runTestSuite \          $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(OOP_TS1_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(OOP_TS1_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(OOP_TS1_TEST_CMDS)"             TESTSUITE_CMDS="$(OOP_TS1_TEST_CMDS)"
 ############################################################################### ###############################################################################
  
 ############################################################################### ###############################################################################
   ##  SSL Test Suite 1: SSL Tests
   ##
   ##  Configuration Options: enableAuthentication=true
   ##                         enableHttpsConnection=true
   ##                         sslClientVerificationMode=optional
   ##                         sslTrustStoreUserName=$(CURRENT_USER)
   ##
   ###############################################################################
   SSL_TS1_CONFIG_OPTIONS = enableHttpsConnection=true enableAuthentication=true \
          sslClientVerificationMode=optional sslTrustStoreUserName=$(CURRENT_USER)
   SSL_TS1_TEST_CMDS = \
          $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/tests@@SSLCertificateTest1
   
   run_SSL_TS1:
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(SSL_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(SSL_TS1_TEST_CMDS)"
   ###############################################################################
   
   ###############################################################################
 ## ##
 ## Trace Configuration ## Trace Configuration
 ## ##
Line 245 
Line 267 
 startcimWithSSL: startcimWithSSL:
         $(CIMSERVER_START_SERVICE) enableHttpConnection=false enableHttpsConnection=true         $(CIMSERVER_START_SERVICE) enableHttpConnection=false enableHttpsConnection=true
         $(SLEEP) 5         $(SLEEP) 5
   
 pegasus:  
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile rebuild  


Legend:
Removed from v.1.24  
changed lines
  Added in v.1.27

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2