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

Diff for /pegasus/TestMakefile between version 1.40 and 1.48

version 1.40, 2005/10/23 00:58:12 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)         $(USAGE)
  
 usage2: FORCE usage2: FORCE
Line 90 
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 126 
Line 129 
 # #
 ############################################################ ############################################################
  
   ##
   ## Although the macros CIMSERVER_STOP_SERVICE and CIMSERVER_START_SERVICE
   ## are available and could be invoked directly, their direct usage is
   ## discouraged in favor of invoking the cimstop and the cimstart rules
   ## as this allows one place where additional checks, delays etc may be
   ## added in the future to control or further test the servers performance
   ## in executing these commands.
   ##
   
 ####################### #######################
 # #
 # doc # doc
Line 143 
Line 155 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(SLEEP) 5         $(SLEEP) 5
         $(RMDIRHIER) $(REPOSITORY_ROOT)         $(RMDIRHIER) $(REPOSITORY_ROOT)
         $(CIMSERVER_START_SERVICE)          $(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
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepositoryServer         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepositoryServer
Line 211 
Line 223 
 # #
  
 servertestsclean: FORCE servertestsclean: FORCE
         -$(CIMSERVER_STOP_SERVICE)          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/CQL/tests/Queries -f Makefile clean         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/CQL/tests/Queries -f Makefile clean
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Query/QueryExpression/tests/Queries -f Makefile clean         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Query/QueryExpression/tests/Queries -f Makefile clean
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile clean         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile clean
Line 220 
Line 232 
 servertestssetup: FORCE servertestssetup: FORCE
         $(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
         $(CIMSERVER_START_SERVICE)          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart
         $(SLEEP) 5         $(SLEEP) 5
  
 servertests: servertestsclean servertestssetup serversuite servertests: servertestsclean servertestssetup serversuite
Line 231 
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 241 
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 267 
Line 306 
 ## ##
 ############################################################################### ###############################################################################
 OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true
   ifndef PEGASUS_DEFAULT_OOP_FALSE
       ifeq ($(OS),HPUX)
           OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false
       endif
       ifeq ($(OS),LINUX)
           OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false
       endif
   endif
 OOP_TS1_TEST_CMDS = \ OOP_TS1_TEST_CMDS = \
         TestClient         TestClient
  
Line 297 
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 321 
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)"
   ###############################################################################
   
  
 ############################################################################### ###############################################################################
  
Line 559 
Line 651 
 ## ##
 ## Trace Configuration ## Trace Configuration
 ## ##
   ## Options: see usagetrace rule
   ##
   ###############################################################################
   
   usagetrace: FORCE
           $(USAGE)
           $(USAGE)"TestMakefile Trace Commands: (cimserver should be running)"
           $(USAGE)
           $(USAGE)
           $(USAGE)" traceon:                  Enables all tracing."
           $(USAGE)" traceoff:                 Disables all tracing."
           $(USAGE)" tracesettings:            Displays trace settings."
           $(USAGE)" tracecomp:                Displays a trace componenets list."
           $(USAGE)" traceon-CL C=[comp] L=[level(1,2,3,4)]:  "
           $(USAGE)"                           Enables tracing on component C at trace level L."
           $(USAGE)"                           Usage example:"
           $(USAGE)"                           Turns tracing on for DiscardedData at level 3"
           $(USAGE)"                           traceon-CL C=DiscardedData L=3"
           $(USAGE)
           $(USAGE)
   
   traceon: FORCE
           @ cimconfig -s traceComponents=ALL
           @ cimconfig -s traceLevel=3 -c
           @ cimconfig -g traceComponents
           @ cimconfig -g traceLevel
   
   traceoff: FORCE
           @ cimconfig -s traceComponents=
           @ cimconfig -g traceComponents
           @ cimconfig -g traceLevel
   
   
   tracesettings: FORCE
           @ $(ECHO) " "
           cimconfig -g traceComponents
           @ $(ECHO) " "
           cimconfig -g traceLevel
           @ $(ECHO) " "
           cimconfig -g traceFilePath
           @ $(ECHO) " "
   
   traceon-CL: FORCE
           @ cimconfig -s traceComponents=$C -c
           @ cimconfig -s traceLevel=$L -c
           @ cimconfig -g traceComponents
           @ cimconfig -g traceLevel
   
   tracecomp: FORCE
           $(USAGE)
           $(USAGE)"Trace component list:"
           $(USAGE)
           $(USAGE)"Channel"
           $(USAGE)"XmlParser"
           $(USAGE)"XmlWriter"
           $(USAGE)"XmlReader"
           $(USAGE)"XmlIO"
           $(USAGE)"Http"
           $(USAGE)"CimData"
           $(USAGE)"ProvManager"
           $(USAGE)"Repository"
           $(USAGE)"Dispatcher"
           $(USAGE)"OsAbstraction"
           $(USAGE)"Config"
           $(USAGE)"IndDelivery"
           $(USAGE)"IndHandler"
           $(USAGE)"Authentication"
           $(USAGE)"Authorization"
           $(USAGE)"UserManager"
           $(USAGE)"SubscriptionService"
           $(USAGE)"Registration"
           $(USAGE)"Shutdown"
           $(USAGE)"Server"
           $(USAGE)"IndicationService"
           $(USAGE)"IndicationServiceInternal"
           $(USAGE)"ConfigurationManager"
           $(USAGE)"MessageQueueService"
           $(USAGE)"ProviderManager"
           $(USAGE)"ObjectResolution"
           $(USAGE)"WQL"
           $(USAGE)"CQL"
           $(USAGE)"Thread"
           $(USAGE)"MetaDispatcher"
           $(USAGE)"IPC"
           $(USAGE)"IndicationHandlerService"
           $(USAGE)"CIMExportRequestDispatcher"
           $(USAGE)"Memory"
           $(USAGE)"SSL"
           $(USAGE)"ControlProvider"
           $(USAGE)"AsyncOpNode"
           $(USAGE)"CIMOMHandle"
           $(USAGE)"BinaryMessageHandler"
           $(USAGE)"L10N"
           $(USAGE)"ExportClient"
           $(USAGE)"Listener"
           $(USAGE)"DiscardedData"
           $(USAGE)"ProviderAgent"
           $(USAGE)
   
   ###############################################################################
   ##
   ## Trace Configuration - Old rules being deprecated
   ##
 ## Options: ## Options:
 ##      XMLTraceOn: Enables XML request and response tracing. ##      XMLTraceOn: Enables XML request and response tracing.
 ##      ProviderLoadTraceOn: Enables Provider load tracing. ##      ProviderLoadTraceOn: Enables Provider load tracing.
Line 588 
Line 783 
         cimconfig -g traceComponents         cimconfig -g traceComponents
         cimconfig -g traceLevel         cimconfig -g traceLevel
  
 AllTraceOn:  AllTraceOn: traceon
         cimconfig -s traceComponents=ALL  
         cimconfig -s traceLevel=3 -c  
         cimconfig -g traceComponents  
         cimconfig -g traceLevel  
  
 AllTraceOff:  AllTraceOff: traceoff
         cimconfig -s traceComponents=  
         cimconfig -g traceComponents  list: tracesettings
         cimconfig -g traceLevel  
  
 list:  
         cimconfig -g traceComponents  
         cimconfig -g traceLevel  
         cimconfig -g traceFilePath  
  
 # More options... # More options...
  
Line 698 
Line 884 
         cimauth -a -u guest -n test1/test2/test3/test4/test5 -R -W         cimauth -a -u guest -n test1/test2/test3/test4/test5 -R -W
         cimauth -a -u guest -n test1/test2/test3/test4/test5/test6 -R -W         cimauth -a -u guest -n test1/test2/test3/test4/test5/test6 -R -W
  
 startcimWithoutSSL:  startcimWithoutSSL: FORCE
         $(CIMSERVER_START_SERVICE)          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart
         $(SLEEP) 5         $(SLEEP) 5
  
 startcimWithSSL:  startcimWithSSL: FORCE
         $(CIMSERVER_START_SERVICE) enableHttpConnection=false enableHttpsConnection=true          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="enableHttpConnection=false enableHttpsConnection=true"
         $(SLEEP) 5         $(SLEEP) 5

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