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

Diff for /pegasus/TestMakefile between version 1.60 and 1.67

version 1.60, 2006/02/17 21:28:39 version 1.67, 2006/05/09 19:17:18
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 232 
Line 234 
  
 servertestssetup: FORCE servertestssetup: FORCE
 ifdef PEGASUS_HAS_SSL 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.  # The association between user names and certificates is stored in the
 # Otherwise, the truststore content will be out-of-sync with the mapping stored in the  # repository.  If the repository is recreated, we also need to re-initialize
 # repository.  # 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 removeSSLTrustDirectories
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile createSSLTrustDirectories         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile createSSLTrustDirectories
 endif endif
Line 243 
Line 247 
         $(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          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile ConfigureUsers
 ifdef PEGASUS_TEST_USER_DEFINED          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile Create_SSL_Certificate
         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 257 
Line 259 
         $(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
  
   #####################
   #
   # stresstests
   #
   stresstests:
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_STRESS_TS1
   
 #################### ####################
 # #
 # serverquicktests # serverquicktests
Line 360 
Line 371 
             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
   
   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)"
   
   ###############################################################################
   ##  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
   
   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)"
   
   ###############################################################################
 ##  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 376 
Line 442 
  
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
 ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
 run_INDSSL_TS1: FORCE  run_INDSSL_TS1: EnableUsers Create_SSL_Certificate_ignore
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1a_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1a_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(INDSSL_TS1a_TEST_CMDS)"             TESTSUITE_CMDS="$(INDSSL_TS1a_TEST_CMDS)"
Line 425 
Line 491 
  
 endif endif
  
   ############################################################################
   #
   # Create_SSL_Certificate
   #
   # create a certificate that can be used for certification testing.
   # It is currently used by the following tests:
   #            -run_INDSSL_TS1
   #
   Create_SSL_Certificate_ignore: FORCE
           -$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile Create_SSL_Certificate
   
   Create_SSL_Certificate: FORCE
   ifdef PEGASUS_HAS_SSL
   ifdef PEGASUS_TEST_USER_DEFINED
           $(ECHO) "Creating SSL certificate for test"
           ssltrustmgr -a -c $(PEGASUS_TEST_USER_ID) -f $(PEGASUS_HOME)/server.pem
   endif
   else
           $(ECHO) "PEGASUS_HAS_SSL not defined - Not Creating SSL certificate for test"
   endif
   
 ############################################################################### ###############################################################################
 ##  G11N Test Suite 1: Globalization Tests ##  G11N Test Suite 1: Globalization Tests
 ## ##
Line 440 
Line 527 
         $(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 922 
Line 1024 
         cimconfig -s enableAuthentication=false -p         cimconfig -s enableAuthentication=false -p
         cimconfig -s enableNamespaceAuthorization=false -p         cimconfig -s enableNamespaceAuthorization=false -p
  
   EnableUsers:
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithoutSSL
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile ConfigureUsers
   
 EnableAuthentication: EnableAuthentication:
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         cimconfig -s enableAuthentication=true -p         cimconfig -s enableAuthentication=true -p
Line 938 
Line 1045 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithSSL         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithSSL
  
   #
   # ConfigureUsers
   #
   # The server must be running prior to invoking this rule
   #
 ConfigureUsers: ConfigureUsers:
 ifndef PEGASUS_PAM_AUTHENTICATION ifndef PEGASUS_PAM_AUTHENTICATION
         cimuser -a -u $(PEGASUS_TEST_USER_ID) -w $(PEGASUS_TEST_USER_PASS)          -cimuser -l
           -cimuser -a -u $(PEGASUS_TEST_USER_ID) -w $(PEGASUS_TEST_USER_PASS)
 endif endif
  
   #
   # ConfigureAuthorizations rule
   #
   # The server must be running prior to invoking this rule
   #
 ConfigureAuthorizations: ConfigureAuthorizations:
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test/cimv2 -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test/cimv2 -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/cimv2 -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/cimv2 -R -W
Line 953 
Line 1071 
         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 972 
Line 1093 
 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.60  
changed lines
  Added in v.1.67
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2