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

Diff for /pegasus/TestMakefile between version 1.71 and 1.77

version 1.71, 2006/08/08 17:26:20 version 1.77, 2006/10/31 20:08:24
Line 63 
Line 63 
         $(USAGE)"servertests        - Execute a basic server test suites (No security, No SSL)"         $(USAGE)"servertests        - Execute a basic server test suites (No security, No SSL)"
         $(USAGE)"standardtests      - Execute an extended server test suites "         $(USAGE)"standardtests      - Execute an extended server test suites "
         $(USAGE)"                     using multiple options."         $(USAGE)"                     using multiple options."
         $(USAGE)"serverquicktests   - Executes a brief server test"  
         $(USAGE)"perftests          - Executes a brief server performance test"         $(USAGE)"perftests          - Executes a brief server performance test"
         $(USAGE)         $(USAGE)
         $(USAGE)"usage2             - usage on secondary test targets"         $(USAGE)"usage2             - usage on secondary test targets"
Line 100 
Line 99 
         $(USAGE)"The following require the repository to be pre-built and the server to be started."         $(USAGE)"The following require the repository to be pre-built and the server to be started."
         $(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)"run_STRESS_TS1          - Executes the stresstests"         $(USAGE)"run_STRESS_TS1          - Executes the stresstests"
         $(USAGE)         $(USAGE)
  
Line 254 
Line 252 
 # the trust store directories. Otherwise, the truststore content will be # the trust store directories. Otherwise, the truststore content will be
 # out-of-sync with the mapping stored in the repository. # out-of-sync with the mapping stored in the repository.
 # #
   #  NOTE: Tests that require their own test namespaces to run poststarttests
   #  should add their namespace creation make commands to pegasus/Makefile
   #  under the testrepository tag.
   #
         $(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 267 
Line 269 
         $(SLEEP) 5         $(SLEEP) 5
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile ConfigureUsers         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile ConfigureUsers
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile Create_SSL_Certificate         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile Create_SSL_Certificate
   ifeq ($(PEGASUS_TEST_SDK),true)
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/SDK/samples -f Makefile setupSDK
   endif
   
  
  
 servertests: servertestsclean servertestssetup serversuite servertests: servertestsclean servertestssetup serversuite
Line 275 
Line 281 
 serversuite: FORCE serversuite: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinRepository         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinRepository
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_Cimsub_InterOp
         $(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_TS1
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOPProvFail_TS2         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOPProvFail_TS2
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOPProvFail_TS3
         $(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         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile runCBATestSuites
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_SDK_TS1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_ExportClientSSL_TS1
  
 ##################### #####################
 # #
Line 293 
Line 303 
  
 #################### ####################
 # #
 # serverquicktests  
 #  
 serverquicktests: servertestsclean servertestssetup serverquicksuite  
         @ $(ECHO) "+++++ TestMakefile serverquicktests complete"  
   
 serverquicksuite: FORCE  
         $(PEGASUS_HOME)/bin/Client  
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile poststarttests  
         $(PEGASUS_HOME)/bin/TestClient  
   
 ####################  
 #  
 # perftests - simple performance test until we have better # perftests - simple performance test until we have better
 # #
 # - Turns statistics on (uses TestInterop until we have better) # - Turns statistics on (uses TestInterop until we have better)
 # - runs and times serverquicktests suite  # - runs poststarttests suite and benchmarkTest
 # - runs cimperf to displat the statistics # - runs cimperf to displat the statistics
 # - turns statistics off # - turns statistics off
 # #
Line 455 
Line 453 
 endif endif
  
 ############################################################################### ###############################################################################
   ##  OOPProvFail Test Suite 3: OOP Provider Module Failure CIM Server restart
   ##                            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_TS3_CONFIG_OPTIONS = forceProviderProcesses=true enableAuthentication=true
   OOPProvFail_TS3a_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS3a
   OOPProvFail_TS3b_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS3b
   
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
   run_OOPProvFail_TS3:
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS3_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(OOPProvFail_TS3a_TEST_CMDS)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS3_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(OOPProvFail_TS3b_TEST_CMDS)"
   else
   run_OOPProvFail_TS3: FORCE
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_OOPProvFail_TS3"
   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 503 
Line 533 
        sslClientVerificationMode=optional sslTrustStoreUserName=$(CURRENT_USER)        sslClientVerificationMode=optional sslTrustStoreUserName=$(CURRENT_USER)
 SSL_TS1_TEST_CMDS = \ SSL_TS1_TEST_CMDS = \
        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/cimtrust/tests@@SSLCertificateTest1        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/cimtrust/tests@@SSLCertificateTest1
   SSL_TS2_TEST_CMDS = \
          $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/cimcrl/tests@@SSLCRLTest1
  
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
 ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
Line 510 
Line 542 
         $(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)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(SSL_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(SSL_TS2_TEST_CMDS)"
 else else
 run_SSL_TS1: FORCE run_SSL_TS1: FORCE
         @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_SSL_TS1"         @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_SSL_TS1"
Line 573 
Line 608 
             TESTSUITE_CMDS="$(STRESS_TS1_TEST_CMDS)"             TESTSUITE_CMDS="$(STRESS_TS1_TEST_CMDS)"
 ############################################################################### ###############################################################################
  
   ###############################################################################
   ##  SDK Test Suite 1:  SDK Tests
   ##
   ##  Configuration Options: (none)
   ##
   ###############################################################################
   SDK_TS1_CONFIG_OPTIONS =
   SDK_TS1_TEST_CMDS = \
           $(MAKE) --directory $(PEGASUS_ROOT)/src/SDK/samples \
               -f Makefile testSDK
   
   ifeq ($(PEGASUS_TEST_SDK),true)
   run_SDK_TS1: FORCE
           $(MAKE) --directory=$(PEGASUS_ROOT)/mak \
               -f $(PEGASUS_ROOT)/mak/SDKMakefile stageINCLUDE \
               PEGASUS_STAGING_DIR=$(PEGASUS_HOME) \
               PEGASUS_INCLUDE_DIR=/include
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/SDK/samples \
               -f Makefile clean
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/SDK/samples \
               -f Makefile PEGASUS_INCLUDE_DIR=$(PEGASUS_HOME)/include
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(SDK_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(SDK_TS1_TEST_CMDS)"
   else
   run_SDK_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_TEST_SDK is not true: Skipping run_SDK_TS1"
   endif
   ###############################################################################
   
   ###############################################################################
   ##  Export Client SSL Test Suite 1:
   ##
   ##  Configuration Options: enableHttpsConnection=true
   ##
   ###############################################################################
   ExportClientSSL_TS1_CONFIG_OPTIONS = enableHttpsConnection=true
   ExportClientSSL_TS1_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Pegasus/ExportClient/tests/ExportClient@@-f@@Makefile@@runExportClientSSL_TS1
   
   ifdef PEGASUS_HAS_SSL
   run_ExportClientSSL_TS1:
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(ExportClientSSL_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(ExportClientSSL_TS1_TEST_CMDS)"
   else
   run_ExportClientSSL_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_HAS_SSL not defined: Skipping run_ExportClientSSL_TS1"
   endif
   
   ###############################################################################
   
   
   
   ###############################################################################
   ##  cimsub CLI Test Suite 1:  PG_InterOp Tests
   ##
   ##  Configuration Options: (none)
   ##
   ###############################################################################
   CIMSUB_INTEROP_CONFIG_OPTIONS =
   CIMSUB_INTEROP_TEST_CMDS = \
           $(MAKE) --directory \
               $(PEGASUS_ROOT)/src/Clients/cimsub/tests/testscriptInterOp \
               -f Makefile cimsubTest_InterOp
   run_Cimsub_InterOp: FORCE
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(CIMSUB_INTEROP_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(CIMSUB_INTEROP_TEST_CMDS)"
   ###############################################################################
  
 ############################################################################### ###############################################################################
  

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