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

Diff for /pegasus/TestMakefile between version 1.48 and 1.52

version 1.48, 2005/11/18 21:07:14 version 1.52, 2005/12/14 22:20:28
Line 228 
Line 228 
         $(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
  
   
 servertestssetup: FORCE servertestssetup: FORCE
   ifdef PEGASUS_HAS_SSL
   # The association between user names and certificates is stored in the repository.  If the
   # repository is recreated, we also need to re-initialize the trust store directories.
   # Otherwise, the truststore content will be out-of-sync with the mapping stored in the
   # repository.
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile removeSSLTrustDirectories
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile createSSLTrustDirectories
   endif
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart
         $(SLEEP) 5         $(SLEEP) 5
   ifdef PEGASUS_HAS_SSL
   ifdef PEGASUS_TEST_USER_DEFINED
           ssltrustmgr -a -c pegtest -f $(PEGASUS_HOME)/server.pem
   endif
   endif
  
 servertests: servertestsclean servertestssetup serversuite servertests: servertestsclean servertestssetup serversuite
         @ $(ECHO) "+++++ TestMakefile servertests suites complete"         @ $(ECHO) "+++++ TestMakefile servertests suites complete"
Line 304 
Line 316 
 ## ##
 ##  Configuration Options: forceProviderProcesses=true ##  Configuration Options: forceProviderProcesses=true
 ## ##
   ##  If PEGASUS_DEFAULT_OOP_ON is set, then tests are run with OOP disabled
   ##  since tests have already been run with OOP enabled.
   ##
   ##
 ############################################################################### ###############################################################################
 OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true  ifeq ($(PEGASUS_DEFAULT_OOP_ON),true)
 ifndef PEGASUS_DEFAULT_OOP_FALSE  
     ifeq ($(OS),HPUX)  
         OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false         OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false
   else
   OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true
     endif     endif
     ifeq ($(OS),LINUX)  
         OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false  
     endif  
 endif  
 OOP_TS1_TEST_CMDS = \ OOP_TS1_TEST_CMDS = \
         TestClient          $(MAKE)@@--directory=$(PEGASUS_ROOT)@@Makefile@@-s@@poststarttests
  
 run_OOP_TS1: run_OOP_TS1:
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile 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)"
   
 ############################################################################### ###############################################################################
  
 ############################################################################### ###############################################################################
Line 349 
Line 363 
 ##  Configuration Options: (none) ##  Configuration Options: (none)
 ## ##
 ############################################################################### ###############################################################################
 INDSSL_TS1_CONFIG_OPTIONS = enableHttpsConnection=true  INDSSL_TS1a_CONFIG_OPTIONS = enableHttpsConnection=true enableAuthentication=false
 INDSSL_TS1a_TEST_CMDS = \ INDSSL_TS1a_TEST_CMDS = \
         $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/IndicationStressTestProvider/testclient@@-f@@Makefile@@wql_10_1@@p=HTTPS          $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/IndicationStressTestProvider/testclient@@-f@@Makefile@@run_TS1_AuthenticationDisabled
   
   INDSSL_TS1b_CONFIG_OPTIONS = enableHttpsConnection=true enableAuthentication=true sslClientVerificationMode=required
 INDSSL_TS1b_TEST_CMDS = \ INDSSL_TS1b_TEST_CMDS = \
         $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/IndicationStressTestProvider/testclient@@-f@@Makefile@@cql_10_1@@p=HTTPS          $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/IndicationStressTestProvider/testclient@@-f@@Makefile@@run_TS1_AuthenticationEnabled
   
  
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
 run_INDSSL_TS1: run_INDSSL_TS1:
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1_CONFIG_OPTIONS)" \              CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1a_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(INDSSL_TS1a_TEST_CMDS)"             TESTSUITE_CMDS="$(INDSSL_TS1a_TEST_CMDS)"
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1_CONFIG_OPTIONS)" \              CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1b_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(INDSSL_TS1b_TEST_CMDS)"             TESTSUITE_CMDS="$(INDSSL_TS1b_TEST_CMDS)"
 else else
 run_INDSSL_TS1: FORCE run_INDSSL_TS1: FORCE

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