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

Diff for /pegasus/TestMakefile between version 1.82 and 1.95

version 1.82, 2007/05/25 18:35:07 version 1.95, 2008/11/17 19:28:53
Line 92 
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)
Line 101 
Line 103 
         $(USAGE)"serversuite             - the collection of test run by the servertests rule"         $(USAGE)"serversuite             - the collection of test run by the servertests rule"
         $(USAGE)"run_STRESS_TS1          - Executes the stresstests"         $(USAGE)"run_STRESS_TS1          - Executes the stresstests"
         $(USAGE)"slptests                - Executes the slptests"         $(USAGE)"slptests                - Executes the slptests"
           $(USAGE)"run_Cmpi_Sub            - Executes the CMPI subscription tests"
         $(USAGE)         $(USAGE)
  
  
Line 171 
Line 174 
 repositoryServer: FORCE repositoryServer: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(SLEEP) 5         $(SLEEP) 5
         $(RMDIRHIER) $(REPOSITORY_ROOT)          $(RMREPOSITORY) $(REPOSITORY_ROOT)
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart
         $(SLEEP) 5         $(SLEEP) 5
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryServer         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryServer
Line 294 
Line 297 
         $(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_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
         $(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_SDK_TS1
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_ExportClientSSL_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
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_idleConnectionTimeout1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_idleConnectionTimeout2
  
 ##################### #####################
 # #
Line 527 
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 \
         enableAuthentication=false
   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 \
         enableAuthentication=false
   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 535 
Line 617 
 ##                         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/cimtrust/tests@@SSLCertificateTest1        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/cimtrust/tests@@SSLCertificateTest1
 SSL_TS2_TEST_CMDS = \  SSL_CBA_TS1_TEST_CMD_2 = \
        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/cimcrl/tests@@SSLCRLTest1        $(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 \         $(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_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_TS2_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 669 
Line 751 
  
  
 ############################################################################### ###############################################################################
   ##  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 ##  cimsub CLI Test Suite 1:  PG_InterOp Tests
 ## ##
 ##  Configuration Options: (none) ##  Configuration Options: (none)
Line 686 
Line 804 
 ############################################################################### ###############################################################################
  
 ############################################################################### ###############################################################################
   ## 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)"
  
   ##############################################################################
  
  
 ############################################################################## ##############################################################################
Line 1023 
Line 1164 
         $(USAGE)"ControlProvider"         $(USAGE)"ControlProvider"
         $(USAGE)"AsyncOpNode"         $(USAGE)"AsyncOpNode"
         $(USAGE)"CIMOMHandle"         $(USAGE)"CIMOMHandle"
         $(USAGE)"BinaryMessageHandler"  
         $(USAGE)"L10N"         $(USAGE)"L10N"
         $(USAGE)"ExportClient"         $(USAGE)"ExportClient"
         $(USAGE)"Listener"         $(USAGE)"Listener"
Line 1113 
Line 1253 
 standardtests: FORCE standardtests: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i DisableSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i DisableSecurity
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestCimmof         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestCimmof
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestNoSecurity  #       $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestNoSecurity
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository testrepository
 ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthentication         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthentication
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestLocalSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestLocalSecurity
Line 1124 
Line 1265 
         @ $(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 1154 
Line 1299 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstop
  
 TestCimmof: TestCimmof:
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Testcimmof poststarttests          # Build the repository with cimmofl and cimmof and compare them.
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
           -@$(MOVE) $(REPOSITORY_DIR)/repository $(REPOSITORY_DIR)/repository-save
           @$(RMREPOSITORY) $(REPOSITORY_DIR)/repository-cimmofl
           @$(RMREPOSITORY) $(REPOSITORY_DIR)/repository-cimmof
           @$(ECHO) $(CIM_SCHEMA_DIR)
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository
           @$(MOVE) $(REPOSITORY_DIR)/repository $(REPOSITORY_DIR)/repository-cimmofl
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart
           @$(ECHO) $(CIM_SCHEMA_DIR)
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryServer
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstop
           @$(MOVE) $(REPOSITORY_DIR)/repository $(REPOSITORY_DIR)/repository-cimmof
           -@$(MOVE) $(REPOSITORY_DIR)/repository-save $(REPOSITORY_DIR)/repository
           TestCompareRepositories $(REPOSITORY_DIR)/repository-cimmofl $(REPOSITORY_DIR)/repository-cimmof
           @$(RMREPOSITORY) $(REPOSITORY_DIR)/repository-cimmofl
           @$(RMREPOSITORY) $(REPOSITORY_DIR)/repository-cimmof
  
 RunTestClientLocal: RunTestClientLocal:
         TestClient -local         TestClient -local
Line 1226 
Line 1387 
         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) ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
         cimauth -a -u pegasus -n root/cimv2 -R -W          cimauth -a -u $(PEGASUS_CIMSERVERMAIN_USER) -n root/cimv2 -R -W
 endif endif
  
 startcimWithoutSSL: FORCE startcimWithoutSSL: FORCE

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