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

Diff for /pegasus/TestMakefile between version 1.69 and 1.87.4.4

version 1.69, 2006/06/27 18:48:09 version 1.87.4.4, 2009/01/06 18:43:54
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 93 
Line 92 
         $(USAGE)         $(USAGE)
         $(USAGE)"The following require the repository to be pre-built."         $(USAGE)"The following require the repository to be pre-built."
         $(USAGE)         $(USAGE)
         $(USAGE)"run_SSL_TS1             - Executes the SSL tests"          $(USAGE)"run_SSL_CBA_TS1         - Executes the Certificate based authentication test suite."
           $(USAGE)"run_SSL_IPV4_TS1        - Executes the IPv4 SSL connection test suite."
           $(USAGE)"run_SSL_IPV6_TS1        - Executes the IPv6 SSL connection test suite."
         $(USAGE)"run_OOP_TS1             - Executes the Out Of Process Provider tests"         $(USAGE)"run_OOP_TS1             - Executes the Out Of Process Provider tests"
         $(USAGE)"run_G11N_TS1            - Executes the Globalization tests"         $(USAGE)"run_G11N_TS1            - Executes the Globalization tests"
         $(USAGE)         $(USAGE)
         $(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)"slptests                - Executes the slptests"
           $(USAGE)"run_Cmpi_Sub            - Executes the CMPI subscription tests"
         $(USAGE)         $(USAGE)
  
  
Line 254 
Line 256 
 # 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
 ifdef PEGASUS_ENABLE_CBA_TESTS  
         @$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \         @$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
             cleanupCBATestCertificates             cleanupCBATestCertificates
         @$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \         @$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
             setupCBATestCertificates             setupCBATestCertificates
 endif  
         $(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
  
   # slptests are run under separate target because these testcases require that
   # both the cimserver and SLP are running. There is no need for special options
   # while starting cimserver.
   slptests:
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/slp/tests/slptests -f Makefile slptests
           @ $(ECHO) "+++++ TestMakefile slp test suite completed"
  
 servertests: servertestsclean servertestssetup serversuite servertests: servertestsclean servertestssetup serversuite
         @ $(ECHO) "+++++ TestMakefile servertests suites complete"         @ $(ECHO) "+++++ TestMakefile servertests suites complete"
Line 277 
Line 290 
 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_IPV4_TS1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_SSL_IPV6_TS1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_SSL_CBA_TS1
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_G11N_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_G11N_TS1
 ifdef PEGASUS_ENABLE_CBA_TESTS  
         $(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
   ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER),true)
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_Cmpi_Sub
 endif endif
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_idleConnectionTimeout1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_idleConnectionTimeout2
  
 ##################### #####################
 # #
Line 297 
Line 319 
  
 #################### ####################
 # #
 # 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 TestBenchmark
 # - runs cimperf to displat the statistics # - runs cimperf to displat the statistics
 # - turns statistics off # - turns statistics off
 # #
Line 324 
Line 334 
         @ $(ECHO) " "         @ $(ECHO) " "
         $(TIME_CMD) $(PEGASUS_HOME)/bin/TestClient         $(TIME_CMD) $(PEGASUS_HOME)/bin/TestClient
         @ $(ECHO) " "         @ $(ECHO) " "
         $(TIME_CMD) $(PEGASUS_HOME)/bin/benchmarkTest          $(TIME_CMD) $(PEGASUS_HOME)/bin/TestBenchmark
         @ $(ECHO) " "         @ $(ECHO) " "
         @ $(ECHO) " "         @ $(ECHO) " "
         $(TIME_CMD) $(PEGASUS_HOME)/bin/cimperf         $(TIME_CMD) $(PEGASUS_HOME)/bin/cimperf
Line 337 
Line 347 
 # alltests # alltests
 # #
 alltests: unittests servertests alltests: unittests servertests
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)  ifeq ($(OS_TYPE),windows)
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile uninstall         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile uninstall
 endif endif
Line 459 
Line 469 
 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 495 
Line 537 
 ############################################################################### ###############################################################################
  
 ############################################################################### ###############################################################################
 ##  SSL Test Suite 1: SSL Tests  ##  SSL IPv4 Test Suite : Tests SSL connections for IPv4
   ##
   ##  Configuration Options: enableHttpsConnection=true
   ##  NOTE : Authentication is not enabled as we are only verifying
   ##         if SSL based IPv6 connections are working correctly. The osinfo
   ##         client requires a password to be passed for a remote connection
   ##         otherwise it will prompt for one. As a work around,
   ##         we are providing a dummy password.
   ##
   ###############################################################################
   SSL_IPV4_TS1_CONFIG_OPTIONS = enableHttpsConnection=true
   SSL_IPV4_TS1_CMD_1 = \
           osinfo -s -w notapassword -h 127.0.0.1 -p 5989
   SSL_IPV4_TS1_CMD_2 = \
           osinfo -s -w notapassword -h localhost -p 5989
   
   ifdef PEGASUS_HAS_SSL
       run_SSL_IPV4_TS1: FORCE
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(SSL_IPV4_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(SSL_IPV4_TS1_CMD_1)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(SSL_IPV4_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(SSL_IPV4_TS1_CMD_2)"
   else
       run_SSL_IPV4_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_HAS_SSL not defined: Skipping run_SSL_IPV4_TS1"
   endif
   
   ###############################################################################
   ##  SSL IPv6 Test Suite : Tests SSL connections for IPv6
   ##
   ##  Configuration Options: enableHttpsConnection=true
   ##  NOTE : Authentication is not enabled as we are only verifying
   ##         if SSL based IPv6 connections are working correctly. The osinfo
   ##         client requires a password to be passed for a remote connection
   ##         otherwise it will prompt for one. As a work around,
   ##         we are providing a dummy password.
   ##
   ##         The IPv4-mapped IPv6 address test is only enabled for unix
   ##         platforms as Windows does not support IPv4-mapped IPv6 addresses
   ##         on certain versions.
   ##
   ###############################################################################
   SSL_IPV6_TS1_CONFIG_OPTIONS = enableHttpsConnection=true
   SSL_IPV6_TS1_CMD_1 = \
           osinfo -s -w notapassword -h ::1 -p 5989
   SSL_IPV6_TS1_CMD_2 = \
           osinfo -s -w notapassword -h ::ffff:127.0.0.1 -p 5989
   
   ifdef PEGASUS_HAS_SSL
       run_SSL_IPV6_TS1: FORCE
       ifeq ($(PEGASUS_TEST_IPV6), true)
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(SSL_IPV6_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(SSL_IPV6_TS1_CMD_1)"
         ifeq ($(OS_TYPE), unix)
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(SSL_IPV6_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(SSL_IPV6_TS1_CMD_2)"
         endif
       else
           @ $(ECHO) "+++++ PEGASUS_TEST_IPV6 not defined: Skipping run_SSL_IPV6_TS1"
       endif
   else
       run_SSL_IPV6_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_HAS_SSL not defined: Skipping run_SSL_IPV6_TS1"
   endif
   
   ###############################################################################
   ##  CBA SSL Test Suite 1: Certificate based authentication Tests
 ## ##
 ##  Configuration Options: enableAuthentication=true ##  Configuration Options: enableAuthentication=true
 ##                         enableHttpsConnection=true ##                         enableHttpsConnection=true
Line 503 
Line 615 
 ##                         sslTrustStoreUserName=$(CURRENT_USER) ##                         sslTrustStoreUserName=$(CURRENT_USER)
 ## ##
 ############################################################################### ###############################################################################
 SSL_TS1_CONFIG_OPTIONS = enableHttpsConnection=true enableAuthentication=true \  SSL_CBA_TS1_CONFIG_OPTIONS = enableHttpsConnection=true enableAuthentication=true \
        sslClientVerificationMode=optional sslTrustStoreUserName=$(CURRENT_USER)        sslClientVerificationMode=optional sslTrustStoreUserName=$(CURRENT_USER)
 SSL_TS1_TEST_CMDS = \  SSL_CBA_TS1_TEST_CMD_1 = \
        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/tests@@SSLCertificateTest1         $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/cimtrust/tests@@SSLCertificateTest1
   SSL_CBA_TS1_TEST_CMD_2 = \
          $(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
 run_SSL_TS1: FORCE  run_SSL_CBA_TS1: FORCE
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(SSL_CBA_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(SSL_CBA_TS1_TEST_CMD_1)"
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(SSL_TS1_CONFIG_OPTIONS)" \              CIMSERVER_CONFIG_OPTIONS="$(SSL_CBA_TS1_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(SSL_TS1_TEST_CMDS)"              TESTSUITE_CMDS="$(SSL_CBA_TS1_TEST_CMD_2)"
 else else
 run_SSL_TS1: FORCE  run_SSL_CBA_TS1: FORCE
         @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_SSL_TS1"          @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_SSL_CBA_TS1"
 endif endif
 else else
 run_SSL_TS1: FORCE  run_SSL_CBA_TS1: FORCE
         @ $(ECHO) "+++++ PEGASUS_HAS_SSL not defined: Skipping run_SSL_TS1 poststarttest"          @ $(ECHO) "+++++ PEGASUS_HAS_SSL not defined: Skipping run_SSL_CBA_TS1"
  
 endif endif
  
Line 539 
Line 656 
 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 577 
Line 694 
             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
  
 ############################################################################### ###############################################################################
  
  
  
   ###############################################################################
   ##  idleConnectionTimeout Test Suite 1:  uses ChunkingStressProvider Tests
   ##
   ##  Configuration Options: idleConnectionTime=55
   ##
   ###############################################################################
   IDLE_CONNECTION_TIMEOUT_1_CONFIG_OPTIONS = idleConnectionTimeout=55
   IDLE_CONNECTION_TIMEOUT_1_TEST_CMDS = \
           $(MAKE)@@--directory \
               $(PEGASUS_ROOT)/src/Providers/TestProviders/ChunkingStressProvider/testclient \
               -f@@Makefile@@poststarttests
   run_idleConnectionTimeout1: FORCE
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(IDLE_CONNECTION_TIMEOUT_1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(IDLE_CONNECTION_TIMEOUT_1_TEST_CMDS)"
   ###############################################################################
   
   
   ###############################################################################
   ##  idleConnectionTimeout Test Suite 2:  uses IdleConnectionTimeout client test
   ##
   ##  Configuration Options: idleConnectionTime=6
   ##
   ###############################################################################
   IDLE_CONNECTION_TIMEOUT_2_CONFIG_OPTIONS = idleConnectionTimeout=6
   IDLE_CONNECTION_TIMEOUT_2_TEST_CMDS = \
           $(MAKE)@@--directory \
               $(PEGASUS_ROOT)/src/Pegasus/Client/tests/IdleConnectionTimeout/ \
               -f@@Makefile@@timeoutTest@@IDLETIME=10
   run_idleConnectionTimeout2: FORCE
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(IDLE_CONNECTION_TIMEOUT_2_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(IDLE_CONNECTION_TIMEOUT_2_TEST_CMDS)"
   ###############################################################################
   
   
   ###############################################################################
   ##  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)"
   ###############################################################################
   
   ###############################################################################
   ## CMPI subscription activation Test Suite 1:
   ##
   ## Configuration Options: (none)
   ##
   ###############################################################################
   CMPI_SUB_TEST_CONFIG_OPTIONS=
   CMPI_SUBa_TEST_CMDS = \
           TestIndicationStressTest TestCMPI_IndicationStressTestClass test/TestProvider setup WQL
   CMPI_SUBb_TEST_CMDS = \
           TestIndicationStressTest TestCMPI_IndicationStressTestClass test/TestProvider getSubscriptionCount
   CMPI_SUBc_TEST_CMDS =  \
           TestIndicationStressTest TestCMPI_IndicationStressTestClass test/TestProvider cleanup
   run_Cmpi_Sub: FORCE
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(CMPI_SUB_TEST_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(CMPI_SUBa_TEST_CMDS)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(CMPI_SUB_TEST_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(CMPI_SUBb_TEST_CMDS)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(CMPI_SUB_TEST_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(CMPI_SUBc_TEST_CMDS)"
   
   ##############################################################################
   
   
 ############################################################################## ##############################################################################
 ## ##
 ## TestXMLRepository rule is used to run the poststarttests suite on ## TestXMLRepository rule is used to run the poststarttests suite on
Line 1017 
Line 1263 
         @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthentication, TestLocalSecurity, and TestRemoteSecurity "         @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthentication, TestLocalSecurity, and TestRemoteSecurity "
         @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthorization and TestAuthorization "         @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthorization and TestAuthorization "
 endif endif
           # Reset the security options to the defaults
           cimconfig -u enableNamespaceAuthorization -p
           cimconfig -u enableAuthentication -p
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         @ $(ECHO) "+++++ TestMakefile standardtests complete"         @ $(ECHO) "+++++ TestMakefile standardtests complete"
  
 TestNoSecurity: TestNoSecurity:
Line 1104 
Line 1354 
         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/MCCAtest/A -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/test/B -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/MCCAtest/B -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test/TestProvider -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
Line 1118 
Line 1368 
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1/test2/test3/test4 -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1/test2/test3/test4 -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1/test2/test3/test4/test5 -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1/test2/test3/test4/test5 -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1/test2/test3/test4/test5/test6 -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1/test2/test3/test4/test5/test6 -R -W
   ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
           cimauth -a -u $(PEGASUS_CIMSERVERMAIN_USER) -n root/cimv2 -R -W
   endif
  
 startcimWithoutSSL: FORCE startcimWithoutSSL: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart
Line 1127 
Line 1380 
         $(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
  
   ###############################################################################
   ##
   ## check_for_cores - used to search for core files in the build environment.
   ##
   ## This option will search (1) each source directory, (2) the PEGASUS_CORE_DIR
   ## if it is defined and (3) the PEGASUS_TMP directory.
   ##
   ###############################################################################
   CORE_FILE_LIST = $(PEGASUS_HOME)/CoreFileList
   
   check_core_search_results:
   ifneq ($(wildcard $(CORE_FILE_LIST)), )
           @$(ECHO) "*** One or more core files found. ***"
           @$(CAT) $(CORE_FILE_LIST)
           @exit 1
   endif
   
   ifdef PEGASUS_CORE_DIR
      CORE_FILES_IN_CORE_DIR = \
          $(wildcard $(PEGASUS_CORE_DIR)/$(PLATFORM_CORE_PATTERN))
   endif
   ifdef PEGASUS_TMP
      CORE_FILES_IN_TMP_DIR = \
          $(wildcard $(PEGASUS_TMP)/$(PLATFORM_CORE_PATTERN))
   endif
   
   generate_core_file_list:
           @$(RM) $(CORE_FILE_LIST)
           @$(MAKE) -s directory=$(PEGASUS_ROOT) general OPTION=CORE_SEARCH \
               CORE_FILE_LIST=$(CORE_FILE_LIST)
   ifdef PEGASUS_CORE_DIR
      ifneq ($(CORE_FILES_IN_CORE_DIR), )
           @$(ECHO) $(CORE_FILES_IN_CORE_DIR) >> $(CORE_FILE_LIST)
      endif
   endif
   ifdef PEGASUS_TMP
      ifneq ($(CORE_FILES_IN_TMP_DIR), )
           @$(ECHO) $(CORE_FILES_IN_TMP_DIR) >> $(CORE_FILE_LIST)
      endif
   endif
   
   check_for_cores:
           @$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
               generate_core_file_list
           @$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
               check_core_search_results
   
   ###############################################################################
   ##
   ## option_summary - used to generate a concise list of build options for use in
   ## a nightly build status report.  This is not intended to be a complete list,
   ## so it is likely that some options are omitted.  New options may be added
   ## here as needs dictate.
   ##
   ###############################################################################
   
   OPTION_SUMMARY =
   ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER),true)
       OPTION_SUMMARY += "+CMPI"
   endif
   ifndef PEGASUS_DISABLE_CQL
       OPTION_SUMMARY += "+CQL"
   endif
   ifdef PEGASUS_HAS_MESSAGES
       OPTION_SUMMARY += "+ICU"
   endif
   ifeq ($(PEGASUS_ENABLE_IPV6),true)
       OPTION_SUMMARY += "+IPv6"
   endif
   ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER),true)
       OPTION_SUMMARY += "+JMPI"
   endif
   ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
       OPTION_SUMMARY += "+PrivSep"
   endif
   ifdef PEGASUS_ENABLE_EXECQUERY
       OPTION_SUMMARY += "+Query"
   endif
   ifdef PEGASUS_ENABLE_REMOTE_CMPI
       OPTION_SUMMARY += "+RCMPI"
   endif
   ifeq ($(PEGASUS_ENABLE_SLP),true)
       OPTION_SUMMARY += "+SLP"
   endif
   ifdef PEGASUS_HAS_SSL
       OPTION_SUMMARY += "+SSL"
   endif
   
   option_summary:
           @$(ECHO) "$(OPTION_SUMMARY)"


Legend:
Removed from v.1.69  
changed lines
  Added in v.1.87.4.4

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2