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

Diff for /pegasus/TestMakefile between version 1.61 and 1.70

version 1.61, 2006/02/17 22:28:09 version 1.70, 2006/07/19 16:16:16
Line 68 
Line 68 
         $(USAGE)         $(USAGE)
         $(USAGE)"usage2             - usage on secondary test targets"         $(USAGE)"usage2             - usage on secondary test targets"
         $(USAGE)"usagetrace         - usage on trace targets"         $(USAGE)"usagetrace         - usage on trace targets"
           $(USAGE)"stresstests        - Execute the default stress test suite"
         $(USAGE)         $(USAGE)
  
 usage2: FORCE usage2: FORCE
Line 100 
Line 101 
         $(USAGE)         $(USAGE)
         $(USAGE)"serversuite             - the collection of test run by the servertests rule"         $(USAGE)"serversuite             - the collection of test run by the servertests rule"
         $(USAGE)"serverquicksuite        - The collection of test run by the serverquicktests rule"         $(USAGE)"serverquicksuite        - The collection of test run by the serverquicktests rule"
           $(USAGE)"run_STRESS_TS1          - Executes the stresstests"
         $(USAGE)         $(USAGE)
  
  
Line 124 
Line 126 
 depend: FORCE depend: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile depend         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile depend
  
   ###############################################################################
   #   mak/certificate_test.mak implements three key functions for
   #   testing Certificate-Based Authentication (CBA).
   #
   #   setupCBATestCertificates is used to create a set of test certificates
   #       make -f TestMakefile setupCBATestCertificates
   #
   #   runCBATestSuites is used to run a set of CBA tests
   #       make -f TestMakefile runCBATestSuites
   #
   #   cleanupCBATestCertificates can be used to remove the test certificates
   #       make -f TestMakefile cleanupCBATestCertificates
   ###############################################################################
   include $(PEGASUS_ROOT)/mak/certificate_test.mak
  
 ############################################################ ############################################################
 # #
Line 243 
Line 259 
 endif 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 \
               cleanupCBATestCertificates
           @$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
               setupCBATestCertificates
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart
         $(SLEEP) 5         $(SLEEP) 5
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile ConfigureUsers         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile ConfigureUsers
Line 257 
Line 277 
         $(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_OOPProvFail_TS1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOPProvFail_TS2
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_INDSSL_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
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile runCBATestSuites
   
   #####################
   #
   # stresstests
   #
   stresstests:
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_STRESS_TS1
  
 #################### ####################
 # #
Line 360 
Line 390 
             TESTSUITE_CMDS="$(IndInit_TS1b_TEST_CMDS)"             TESTSUITE_CMDS="$(IndInit_TS1b_TEST_CMDS)"
  
 ############################################################################### ###############################################################################
   ##  OOPProvFail Test Suite 1: OOP Provider Module Failure Tests
   ##
   ##  Configuration Options: forceProviderProcesses=true
   ##  enableAuthentication=true, enableAuthentication=false
   ##
   ##  NOTE: Regardless of the setting of PEGASUS_DEFAULT_ENABLE_OOP, this test
   ##  suite is always run with OOP enabled.  This test suite causes a provider to
   ##  exit.  Running this test suite with OOP disabled would cause the cimserver
   ##  to exit and the test suite to fail.
   ##
   ##  NOTE: The test is run once with authentication enabled, and once without
   ##  authentication enabled.
   ##
   ###############################################################################
   OOPProvFail_TS1a_CONFIG_OPTIONS = forceProviderProcesses=true enableAuthentication=true
   OOPProvFail_TS1b_CONFIG_OPTIONS = forceProviderProcesses=true enableAuthentication=false
   OOPProvFail_TS1_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS1
   
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
   run_OOPProvFail_TS1:
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS1a_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(OOPProvFail_TS1_TEST_CMDS)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS1b_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(OOPProvFail_TS1_TEST_CMDS)"
   else
   run_OOPProvFail_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_OOPProvFail_TS1"
   endif
   
   ###############################################################################
   ##  OOPProvFail Test Suite 2: OOP Provider Module Failure on IndicationService
   ##                            Initialization Tests
   ##
   ##  Configuration Options: forceProviderProcesses=true
   ##                         enableAuthentication=true
   ##
   ##  NOTE: Regardless of the setting of PEGASUS_DEFAULT_ENABLE_OOP, this test
   ##  suite is always run with OOP enabled.  This test suite causes a provider to
   ##  exit.  Running this test suite with OOP disabled would cause the cimserver
   ##  to exit and the test suite to fail.
   ##
   ###############################################################################
   OOPProvFail_TS2_CONFIG_OPTIONS = forceProviderProcesses=true enableAuthentication=true
   OOPProvFail_TS2a_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS2a
   OOPProvFail_TS2b_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS2b
   
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
   run_OOPProvFail_TS2:
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS2_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(OOPProvFail_TS2a_TEST_CMDS)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS2_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(OOPProvFail_TS2b_TEST_CMDS)"
   else
   run_OOPProvFail_TS2: FORCE
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_OOPProvFail_TS2"
   endif
   
   ###############################################################################
 ##  Indication SSL Test Suite 1: Indication Testing over HTTPS ##  Indication SSL Test Suite 1: Indication Testing over HTTPS
 ## ##
 ##  Configuration Options: (none) ##  Configuration Options: (none)
Line 461 
Line 556 
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(G11N_TS1_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(G11N_TS1_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(G11N_TS1_TEST_CMDS)"             TESTSUITE_CMDS="$(G11N_TS1_TEST_CMDS)"
   
   ###############################################################################
   ##  Stress Test Suite 1:  Default Stress Tests
   ##
   ##  Configuration Options: (none)
   ##
   ###############################################################################
   STRESS_TS1_CONFIG_OPTIONS =
   STRESS_TS1_TEST_CMDS = \
           TestStressTestController
   
   run_STRESS_TS1:
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(STRESS_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(STRESS_TS1_TEST_CMDS)"
 ############################################################################### ###############################################################################
  
  
Line 971 
Line 1081 
 # #
 ConfigureUsers: ConfigureUsers:
 ifndef PEGASUS_PAM_AUTHENTICATION ifndef PEGASUS_PAM_AUTHENTICATION
         cimuser -l          -cimuser -l
         -cimuser -a -u $(PEGASUS_TEST_USER_ID) -w $(PEGASUS_TEST_USER_PASS)         -cimuser -a -u $(PEGASUS_TEST_USER_ID) -w $(PEGASUS_TEST_USER_PASS)
 endif endif
  
Line 990 
Line 1100 
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test/static -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test/static -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/SampleProvider -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/SampleProvider -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root -R -W
           cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/test/A -R -W
           cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/test/B -R -W
           cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test/TestProvider -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1 -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1 -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test2 -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test2 -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test3 -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test3 -R -W
Line 1009 
Line 1122 
 startcimWithSSL: FORCE startcimWithSSL: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="enableHttpConnection=false enableHttpsConnection=true"         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="enableHttpConnection=false enableHttpsConnection=true"
         $(SLEEP) 5         $(SLEEP) 5
   

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