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

Diff for /pegasus/TestMakefile between version 1.44 and 1.48

version 1.44, 2005/11/08 21:38:02 version 1.48, 2005/11/18 21:07:14
Line 62 
Line 62 
         $(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)"serverquicktests   - Executes a brief server 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"
         $(USAGE)"usagetrace         - usage on trace targets"         $(USAGE)"usagetrace         - usage on trace targets"
Line 91 
Line 92 
         $(USAGE)         $(USAGE)
         $(USAGE)"run_SSL_TS1             - Executes the SSL tests"         $(USAGE)"run_SSL_TS1             - Executes the SSL tests"
         $(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)         $(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)
Line 241 
Line 243 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinRepository         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinRepository
         $(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_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
  
 #################### ####################
 # #
Line 251 
Line 255 
         @ $(ECHO) "+++++ TestMakefile serverquicktests complete"         @ $(ECHO) "+++++ TestMakefile serverquicktests complete"
  
 serverquicksuite: FORCE serverquicksuite: FORCE
         $(PEGASUS_HOME)/bin/TestClient  
         $(PEGASUS_HOME)/bin/Client         $(PEGASUS_HOME)/bin/Client
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile poststarttests         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile poststarttests
           $(PEGASUS_HOME)/bin/TestClient
   
   ####################
   #
   # perftests - simple performance test until we have better
   #
   # - Turns statistics on (uses TestInterop until we have better)
   # - runs and times serverquicktests suite
   # - runs cimperf to displat the statistics
   # - turns statistics off
   #
   perftests: servertestsclean servertestssetup perfsuite
   
   perfsuite: FORCE
           $(PEGASUS_HOME)/bin/TestInterop on
           $(TIME_CMD) $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile poststarttests
           @ $(ECHO) " "
           $(TIME_CMD) $(PEGASUS_HOME)/bin/TestClient
           @ $(ECHO) " "
           $(TIME_CMD) $(PEGASUS_HOME)/bin/benchmarkTest
           @ $(ECHO) " "
           @ $(ECHO) " "
           $(TIME_CMD) $(PEGASUS_HOME)/bin/cimperf
           @ $(ECHO) " "
           $(PEGASUS_HOME)/bin/TestInterop off
   
  
 #################### ####################
 # #
Line 281 
Line 310 
     ifeq ($(OS),HPUX)     ifeq ($(OS),HPUX)
         OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false         OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false
     endif     endif
       ifeq ($(OS),LINUX)
           OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false
       endif
 endif endif
 OOP_TS1_TEST_CMDS = \ OOP_TS1_TEST_CMDS = \
         TestClient         TestClient
Line 312 
Line 344 
             TESTSUITE_CMDS="$(IndInit_TS1b_TEST_CMDS)"             TESTSUITE_CMDS="$(IndInit_TS1b_TEST_CMDS)"
  
 ############################################################################### ###############################################################################
   ##  Indication SSL Test Suite 1: Indication Testing over HTTPS
   ##
   ##  Configuration Options: (none)
   ##
   ###############################################################################
   INDSSL_TS1_CONFIG_OPTIONS = enableHttpsConnection=true
   INDSSL_TS1a_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/IndicationStressTestProvider/testclient@@-f@@Makefile@@wql_10_1@@p=HTTPS
   INDSSL_TS1b_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/IndicationStressTestProvider/testclient@@-f@@Makefile@@cql_10_1@@p=HTTPS
   
   ifdef PEGASUS_HAS_SSL
   run_INDSSL_TS1:
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(INDSSL_TS1a_TEST_CMDS)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(INDSSL_TS1b_TEST_CMDS)"
   else
   run_INDSSL_TS1: FORCE
           @ $(ECHO) "PEGASUS_HAS_SSL not defined: Skipping run_INDSSL_TS1"
   endif
   
   
   ###############################################################################
   
   ###############################################################################
 ##  SSL Test Suite 1: SSL Tests ##  SSL Test Suite 1: SSL Tests
 ## ##
 ##  Configuration Options: enableAuthentication=true ##  Configuration Options: enableAuthentication=true
Line 336 
Line 396 
  
 endif endif
  
   ###############################################################################
   ##  G11N Test Suite 1: Globalization Tests
   ##
   ##  Configuration Options: forceProviderProcesses=false
   ##
   ###############################################################################
   G11N_TS1_CONFIG_OPTIONS = forceProviderProcesses=false
   G11N_TS1_TEST_CMDS = \
           $(MAKE) --directory $(PEGASUS_ROOT)/src/Clients/g11ntest \
               -f Makefile g11ntest
   
   run_G11N_TS1:
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(G11N_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(G11N_TS1_TEST_CMDS)"
   ###############################################################################
   
  
 ############################################################################### ###############################################################################
  

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