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

Diff for /pegasus/TestMakefile between version 1.74.2.2 and 1.78.2.2

version 1.74.2.2, 2006/10/30 20:45:13 version 1.78.2.2, 2006/12/29 07:28:22
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)"slptests            - Executes the slptests"         $(USAGE)"slptests            - Executes the slptests"
         $(USAGE)         $(USAGE)
  
Line 173 
Line 170 
 # #
 repositoryServer: FORCE repositoryServer: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(SLEEP) 5          $(SLEEP) 10
         $(RMDIRHIER) $(REPOSITORY_ROOT)         $(RMDIRHIER) $(REPOSITORY_ROOT)
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart
         $(SLEEP) 5          $(SLEEP) 10
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryServer         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryServer
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepositoryServer         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepositoryServer
  
Line 227 
Line 224 
  
  
 shortsleep: FORCE shortsleep: FORCE
         @$(SLEEP) 5          @$(SLEEP) 10
  
 #################### ####################
 # #
Line 256 
Line 253 
 # 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 266 
Line 267 
         @$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \         @$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
             setupCBATestCertificates             setupCBATestCertificates
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart
         $(SLEEP) 5          $(SLEEP) 10
         $(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) ifeq ($(PEGASUS_TEST_SDK),true)
         $(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: slptests:
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/slp/tests/slptests -f Makefile slptests         $(MAKE) --directory=$(PEGASUS_ROOT)/src/slp/tests/slptests -f Makefile slptests
         @ $(ECHO) "+++++ TestMakefile slp test suite completed"         @ $(ECHO) "+++++ TestMakefile slp test suite completed"
Line 281 
Line 285 
         @ $(ECHO) "+++++ TestMakefile servertests suites complete"         @ $(ECHO) "+++++ TestMakefile servertests suites complete"
  
 serversuite: FORCE serversuite: FORCE
           $(ECHO) "========== poststarttests"
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests
           $(ECHO) "========== TestBinRepository"
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinRepository         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinRepository
           $(ECHO) "========== run_Cimsub_InterOp"
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_Cimsub_InterOp
           $(ECHO) "========== run_OOP_TS1"
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOP_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOP_TS1
           $(ECHO) "========== run_IndInit_TS1"
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_IndInit_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_IndInit_TS1
           $(ECHO) "========== run_OOPProvFail_TS1"
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOPProvFail_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOPProvFail_TS1
           $(ECHO) "========== run_OOPProvFail_TS2"
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOPProvFail_TS2         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOPProvFail_TS2
           $(ECHO) "========== run_OOPProvFail_TS3"
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOPProvFail_TS3         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOPProvFail_TS3
           $(ECHO) "========== run_INDSSL_TS1"
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_INDSSL_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_INDSSL_TS1
           $(ECHO) "========== run_SSL_TS1"
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_SSL_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_SSL_TS1
           $(ECHO) "========== run_G11N_TS1"
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_G11N_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_G11N_TS1
           $(ECHO) "========== runCBATestSuites"
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile runCBATestSuites         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile runCBATestSuites
           $(ECHO) "========== run_SDK_TS1"
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_SDK_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_SDK_TS1
           $(ECHO) "========== run_ExportClientSSL_TS1"
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_ExportClientSSL_TS1
  
 ##################### #####################
 # #
Line 303 
Line 323 
  
 #################### ####################
 # #
 # 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 651 
Line 659 
 ############################################################################### ###############################################################################
  
 ############################################################################### ###############################################################################
   ##  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
           $(ECHO) "ATTN:MEB BEFORE"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(CIMSUB_INTEROP_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(CIMSUB_INTEROP_TEST_CMDS)"
           $(ECHO) "ATTN:MEB AFTER"
   
   ###############################################################################
   
   ###############################################################################
  
  
  
Line 716 
Line 768 
 ## ##
 ## TestXMLStartServer ## TestXMLStartServer
 ## ##
   #ATTN:MEB:
 TestXMLStartServer: FORCE TestXMLStartServer: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run
         - $(MKDIRHIER) $(PEGASUS_HOME)/repository_xml         - $(MKDIRHIER) $(PEGASUS_HOME)/repository_xml
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="repositoryDir=$(PEGASUS_HOME)/repository_xml"         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="repositoryDir=$(PEGASUS_HOME)/repository_xml"
         $(SLEEP) 5          $(SLEEP) 10
  
 #### ####
 #### The following caused the cimserver to fail on startup #### The following caused the cimserver to fail on startup
Line 830 
Line 883 
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run
         - $(MKDIRHIER) $(PEGASUS_HOME)/repository_bin         - $(MKDIRHIER) $(PEGASUS_HOME)/repository_bin
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="enableBinaryRepository=true repositoryDir=$(PEGASUS_HOME)/repository_bin"         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="enableBinaryRepository=true repositoryDir=$(PEGASUS_HOME)/repository_bin"
         $(SLEEP) 5          $(SLEEP) 10
  
 ########################### ###########################
 ## ##
Line 1193 
Line 1246 
  
 startcimWithoutSSL: FORCE startcimWithoutSSL: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart
         $(SLEEP) 5          $(SLEEP) 10
  
 startcimWithSSL: FORCE startcimWithSSL: FORCE
         $(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) 10
  

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