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

Diff for /pegasus/TestMakefile between version 1.46 and 1.55

version 1.46, 2005/11/09 20:36:16 version 1.55, 2006/01/10 19:53:49
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 243 
Line 255 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinRepository         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinRepository
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOP_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOP_TS1
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_IndInit_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_IndInit_TS1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_INDSSL_TS1
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_SSL_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_SSL_TS1
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_G11N_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_G11N_TS1
  
Line 303 
Line 316 
 ## ##
 ##  Configuration Options: forceProviderProcesses=true ##  Configuration Options: forceProviderProcesses=true
 ## ##
   ##  If PEGASUS_DEFAULT_ENABLE_OOP 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_ENABLE_OOP),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
 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 340 
Line 358 
             TESTSUITE_CMDS="$(IndInit_TS1b_TEST_CMDS)"             TESTSUITE_CMDS="$(IndInit_TS1b_TEST_CMDS)"
  
 ############################################################################### ###############################################################################
   ##  Indication SSL Test Suite 1: Indication Testing over HTTPS
   ##
   ##  Configuration Options: (none)
   ##
   ###############################################################################
   INDSSL_TS1a_CONFIG_OPTIONS = enableHttpsConnection=true enableAuthentication=false
   INDSSL_TS1a_TEST_CMDS = \
           $(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 = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/IndicationStressTestProvider/testclient@@-f@@Makefile@@run_TS1_AuthenticationEnabled
   
   
   ifdef PEGASUS_HAS_SSL
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
   run_INDSSL_TS1: FORCE
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1a_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(INDSSL_TS1a_TEST_CMDS)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1b_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(INDSSL_TS1b_TEST_CMDS)"
   else
   run_INDSSL_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_INDSSL_TS1"
   endif
   else
   run_INDSSL_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_HAS_SSL not defined: Skipping run_INDSSL_TS1"
   endif
   
   
   ###############################################################################
   
   ###############################################################################
 ##  SSL Test Suite 1: SSL Tests ##  SSL Test Suite 1: SSL Tests
 ## ##
 ##  Configuration Options: enableAuthentication=true ##  Configuration Options: enableAuthentication=true
Line 354 
Line 408 
        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/tests@@SSLCertificateTest1        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/tests@@SSLCertificateTest1
  
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
 run_SSL_TS1: FORCE run_SSL_TS1: FORCE
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(SSL_TS1_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(SSL_TS1_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(SSL_TS1_TEST_CMDS)"             TESTSUITE_CMDS="$(SSL_TS1_TEST_CMDS)"
 else else
 run_SSL_TS1: FORCE run_SSL_TS1: FORCE
         @ $(ECHO) "PEGASUS_HAS_SSL not defined: Skipping run_SSL_TS1 poststarttest"          @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_SSL_TS1"
   endif
   else
   run_SSL_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_HAS_SSL not defined: Skipping run_SSL_TS1 poststarttest"
  
 endif endif
  
Line 757 
Line 816 
  
 list: tracesettings list: tracesettings
  
   #########################################################################
 # More options...  # standardtests
   #
   # More testing options...
   #
   # The standard test seem to contain additional test that may not be able
   # to run on all platforms so they have been grouped here for now rather than
   # being included in the serversuite rule.
   #
   # The test are:
   #      TestCimmof
   #      TestNoSecurity
   #      TestLocalSecurity
   #      TestRemoteSecurity
   #      TestAuthorization
   #
   # NOTE: The TestsNoSecurity test is comprised of DisableSecurity and
   #       TestNoSecurity.
   #
   # NOTE: The TestNoSecurity step runs the servertests which builds the
   #       the repository that is then left in place for the remaining tests.
   #       The cimof test must be before the TestNosecurity step as it removes
   #       the repository builds a new one with cimmofl and another one with
   #       cimmof and then compares them.
   #
   # NOTE: The Authentication test is comprised of EnableAuthentication,
   #       TestLocalSecurity and TestRemoteSecurity.
   #
   # NOTE: The Authorization test is comprised of EnableAuthorization and
   #       TestAuthorization.
   #
   # NOTE: The EnableAuthentication and EnableAuthorization steps require
   #       root access. Pegasus doesn't currently have the infrastructure
   #       in place to run the server as root and run the test as non-root.
   #       Rather than run everything, server, tests, providers, clients etc.
   #       as root many testers prefer to run the tests as non-root. Setting
   #       PEGASUS_DISABLE_PRIVILEGED_TESTS in the environment helps to
   #       facilitate that.
   #
  
 standardtests: FORCE standardtests: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i DisableSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i DisableSecurity
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestCimmof         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestCimmof
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestNoSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestNoSecurity
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthentication         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthentication
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestLocalSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestLocalSecurity
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestRemoteSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestRemoteSecurity
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthorization         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthorization
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestAuthorization         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestAuthorization
   else
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthentication, TestLocalSecurity, and TestRemoteSecurity "
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthorization and TestAuthorization "
   endif
         @ $(ECHO) "+++++ TestMakefile standardtests complete"         @ $(ECHO) "+++++ TestMakefile standardtests complete"
  
 TestNoSecurity: TestNoSecurity:

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