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

Diff for /pegasus/TestMakefile between version 1.77 and 1.84

version 1.77, 2006/10/31 20:08:24 version 1.84, 2007/08/21 18:06:49
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 100 
Line 102 
         $(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)"run_STRESS_TS1          - Executes the stresstests"         $(USAGE)"run_STRESS_TS1          - Executes the stresstests"
           $(USAGE)"slptests                - Executes the slptests"
         $(USAGE)         $(USAGE)
  
  
Line 273 
Line 276 
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/SDK/samples -f Makefile setupSDK         $(MAKE) --directory=$(PEGASUS_ROOT)/src/SDK/samples -f Makefile setupSDK
 endif 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 288 
Line 296 
         $(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
Line 306 
Line 316 
 # 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 poststarttests suite and benchmarkTest  # - runs poststarttests suite and TestBenchmark
 # - runs cimperf to displat the statistics # - runs cimperf to displat the statistics
 # - turns statistics off # - turns statistics off
 # #
Line 318 
Line 328 
         @ $(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 331 
Line 341 
 # 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 521 
Line 531 
 ############################################################################### ###############################################################################
  
 ############################################################################### ###############################################################################
 ##  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.
   ##
   ###############################################################################
   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)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(SSL_IPV6_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(SSL_IPV6_TS1_CMD_2)"
       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 529 
Line 603 
 ##                         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 1205 
Line 1279 
         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 1219 
Line 1293 
         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

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