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

Diff for /pegasus/TestMakefile between version 1.67 and 1.76

version 1.67, 2006/05/09 19:17:18 version 1.76, 2006/10/20 19:19:45
Line 126 
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 240 
Line 254 
 # 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
         $(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
         $(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 257 
Line 283 
 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 run_SDK_TS1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_ExportClientSSL_TS1
  
 ##################### #####################
 # #
Line 390 
Line 421 
 OOPProvFail_TS1_TEST_CMDS = \ OOPProvFail_TS1_TEST_CMDS = \
         $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS1         $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS1
  
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
 run_OOPProvFail_TS1: run_OOPProvFail_TS1:
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS1a_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS1a_CONFIG_OPTIONS)" \
Line 397 
Line 429 
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS1b_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS1b_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(OOPProvFail_TS1_TEST_CMDS)"             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 ##  OOPProvFail Test Suite 2: OOP Provider Module Failure on IndicationService
Line 417 
Line 453 
 OOPProvFail_TS2b_TEST_CMDS = \ OOPProvFail_TS2b_TEST_CMDS = \
         $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS2b         $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS2b
  
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
 run_OOPProvFail_TS2: run_OOPProvFail_TS2:
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS2_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS2_CONFIG_OPTIONS)" \
Line 424 
Line 461 
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS2_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS2_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(OOPProvFail_TS2b_TEST_CMDS)"             TESTSUITE_CMDS="$(OOPProvFail_TS2b_TEST_CMDS)"
   else
   run_OOPProvFail_TS2: FORCE
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_OOPProvFail_TS2"
   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
Line 473 
Line 546 
 SSL_TS1_CONFIG_OPTIONS = enableHttpsConnection=true enableAuthentication=true \ SSL_TS1_CONFIG_OPTIONS = enableHttpsConnection=true enableAuthentication=true \
        sslClientVerificationMode=optional sslTrustStoreUserName=$(CURRENT_USER)        sslClientVerificationMode=optional sslTrustStoreUserName=$(CURRENT_USER)
 SSL_TS1_TEST_CMDS = \ SSL_TS1_TEST_CMDS = \
        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/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 481 
Line 556 
         $(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 506 
Line 584 
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
 ifdef PEGASUS_TEST_USER_DEFINED ifdef PEGASUS_TEST_USER_DEFINED
         $(ECHO) "Creating SSL certificate for test"         $(ECHO) "Creating SSL certificate for test"
         ssltrustmgr -a -c $(PEGASUS_TEST_USER_ID) -f $(PEGASUS_HOME)/server.pem          cimtrust -a -U $(PEGASUS_TEST_USER_ID) -f $(PEGASUS_HOME)/server.pem -Ts
 endif endif
 else else
         $(ECHO) "PEGASUS_HAS_SSL not defined - Not Creating SSL certificate for test"         $(ECHO) "PEGASUS_HAS_SSL not defined - Not Creating SSL certificate for test"
Line 544 
Line 622 
             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.67  
changed lines
  Added in v.1.76
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2