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

Diff for /pegasus/TestMakefile between version 1.38.2.2 and 1.65.2.1

version 1.38.2.2, 2005/10/04 22:37:32 version 1.65.2.1, 2006/04/18 04:17:11
Line 1 
Line 1 
 #//%2005////////////////////////////////////////////////////////////////////////  #//%2006////////////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 #// EMC Corporation; VERITAS Software Corporation; The Open Group. #// EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; Symantec Corporation; The Open Group.
 #// #//
 #// Permission is hereby granted, free of charge, to any person obtaining a copy #// Permission is hereby granted, free of charge, to any person obtaining a copy
 #// of this software and associated documentation files (the "Software"), to #// of this software and associated documentation files (the "Software"), to
Line 30 
Line 32 
 ## ##
 ## Test Makefile for Pegasus CIMOM ## Test Makefile for Pegasus CIMOM
 ## ##
 ## Options:  ## see the usage rule for documentation of rules etc.
 ##      rebuild            - Rebuild  
 ##      build              - Build  
 ##      prestarttests      - Execute functional tests  
 ##      poststarttests     - Execute poststarttests (No security, No SSL)  
 ##      tests              - Execute prestarttests and poststarttests  
 ##      standardtests      - Execute poststartests and a series of  
 ##                           posstarttests using multiple options.  
 ##  
 #####################  
 ##  
 ## The following are all standalone tests. That is the can be invoked  
 ## without any prerequisite dependencies. They stop and start the server as  
 ## needed. They clean and rebuild the repository as needed and then run the  
 ## poststarttests.  
 ##  
 ##      TestXMLRepository  - Executes poststartests on binary repository  
 ##                              built with cimmofl.  
 ##  
 ##      TestXMLRepositoryServer - Executes poststartests on binary repository  
 ##                              built with cimmof.  
 ##  
 ##      TestXMLCmpRepository - Executes poststartests on binary compressed  
 ##                              repository built with cimmofl.  
 ##  
 ##  
 ##      TestBinRepository  - Executes poststartests on binary repository  
 ##                              built with cimmofl.  
 ##  
 ##      TestBinRepositoryServer - Executes poststartests on binary repository  
 ##                              built with cimmof.  
 ##  
 ##      TestBinCmpRepository - Executes poststartests on binary compressed  
 ##                              repository built with cimmofl.  
 ## ##
 ## ##
 ############################################################################### ###############################################################################
  
 error: error:
         @ $(ECHO) "Specify desired makefile option (i.e., build, rebuild)"          @ $(ECHO) "Specify desired makefile option (i.e., unittests, usage )"
  
 include $(PEGASUS_ROOT)/mak/config.mak include $(PEGASUS_ROOT)/mak/config.mak
 include $(PEGASUS_ROOT)/mak/test.mak include $(PEGASUS_ROOT)/mak/test.mak
Line 77 
Line 46 
  
 system = localhost system = localhost
  
 TESTS = prestarttests poststarttests  
   
 .PHONY: FORCE .PHONY: FORCE
  
 FORCE: FORCE:
  
 rebuild: clean all tests  usage: FORCE
           $(USAGE)
           $(USAGE)"TestMakefile Primary Targets:"
           $(USAGE)
           $(USAGE)"The following are all standalone tests. They stop and start the server,"
           $(USAGE)"and build repositories as needed."
           $(USAGE)
           $(USAGE)"alltests           - Execute unittests and servertests"
           $(USAGE)"unittests          - Execute the unit functional tests - no repository"
           $(USAGE)"                     or active server is required"
           $(USAGE)"servertests        - Execute a basic server test suites (No security, No SSL)"
           $(USAGE)"standardtests      - Execute an extended server test suites "
           $(USAGE)"                     using multiple options."
           $(USAGE)"serverquicktests   - Executes a brief server test"
           $(USAGE)"perftests          - Executes a brief server performance test"
           $(USAGE)
           $(USAGE)"usage2             - usage on secondary test targets"
           $(USAGE)"usagetrace         - usage on trace targets"
           $(USAGE)
   
   usage2: FORCE
           $(USAGE)
           $(USAGE)"TestMakefile Secondary Targets:"
           $(USAGE)
           $(USAGE)"The following are run as part of the Primary target test suites and may"
           $(USAGE)"also be invoked as standalone tests."
           $(USAGE)
           $(USAGE)"TestXMLRepository       - Executes poststarttests on XML repository"
           $(USAGE)"                          built with cimmofl."
           $(USAGE)"TestXMLRepositoryServer - Executes poststarttests on XML repository"
           $(USAGE)"                          built with cimmof."
           $(USAGE)"TestXMLCmpRepository    - Executes poststarttests on XML compressed"
           $(USAGE)"                          repository built with cimmofl."
           $(USAGE)"TestBinRepository       - Executes poststarttests on binary repository "
           $(USAGE)"                          built with cimmofl."
           $(USAGE)"TestBinRepositoryServer - Executes poststarttests on binary repository"
           $(USAGE)"                          built with cimmof."
           $(USAGE)"TestBinCmpRepository    - Executes poststarttests on binary compressed"
           $(USAGE)"                          repository built with cimmofl."
           $(USAGE)
           $(USAGE)"The following require the repository to be pre-built."
           $(USAGE)
           $(USAGE)"run_SSL_TS1             - Executes the SSL tests"
           $(USAGE)"run_OOP_TS1             - Executes the Out Of Process Provider tests"
           $(USAGE)"run_G11N_TS1            - Executes the Globalization tests"
           $(USAGE)
           $(USAGE)"The following require the repository to be pre-built and the server to be started."
           $(USAGE)
           $(USAGE)"serversuite             - the collection of test run by the servertests rule"
           $(USAGE)"serverquicksuite        - The collection of test run by the serverquicktests rule"
           $(USAGE)
   
   
   ##########################################################
   #
   # rules that are defined in Makefile
   #
   ##########################################################
   
   build: FORCE
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile build
  
 build: all tests  world: FORCE
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile world
  
 clean:  new: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile clean          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile new
  
 buildmu:  clean: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile clean
         $(MKDIRHIER) $(BIN_DIR)  
  
 all: buildmu  depend: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile depend         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile depend
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile all  
  
   
   ############################################################
   #
   # rules defined here
   #
   ############################################################
   
   ##
   ## 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: doc:
         $(MAKE) --directory=$(PEGASUS_ROOT)/doc/ProviderSpec -f Makefile         $(MAKE) --directory=$(PEGASUS_ROOT)/doc/ProviderSpec -f Makefile
         $(MAKE) --directory=$(PEGASUS_ROOT)/doc/DevManual -f Makefile         $(MAKE) --directory=$(PEGASUS_ROOT)/doc/DevManual -f Makefile
  
 repositoryServer:  
   #######################
   #
   # repositoryServer
   #
   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)         $(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
  
 prestarttests:  ######################
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop  #
         $(SLEEP) 5  # prestarttests is being deprecated since poststarttest is being deprecated
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository  # in favor of name more related to its intended functionality.
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository  #
   prestarttests: prestarttests_msg shortsleep unittests
   
   prestarttests_msg: FORCE
           @$(ECHO) "=============================================================================="
           @$(ECHO) "TestMakefile: The \"prestarttests\" rule is being deprecated."
           @$(ECHO) "              Use \"make testusage\" for a description of the usage model."
           @$(ECHO) "              The equivalent new rule is \"unittests\"."
           @$(ECHO) "              Invoking the \"unittests\" rule now."
           @$(ECHO) "=============================================================================="
   
   ####################
   #
   # poststarttests is being deprecated since it multiply defines a
   # recursive make rule leading to ambuguity and confusion.
   #
   poststarttests: poststarttests_msg shortsleep servertests
   
   poststarttests_msg: FORCE
           @$(ECHO) "==============================================================================="
           @$(ECHO) "TestMakefile: The \"posstarttests\" rule is being deprecated.."
           @$(ECHO) "              Use \"make testusage\" for a description of the usage model."
           @$(ECHO) "              The equivalent new rule is \"servertests\"."
           @$(ECHO) "              Invoking the \"servertests\" rule now."
           @$(ECHO) "==============================================================================="
   
   #####################
   #
   # tests is being deprecated since it multiply defines a
   # recursive make rule leading to ambuguity and confusion.
   #
   tests: tests_msg shortsleep alltests
   
   tests_msg: FORCE
           @$(ECHO) "==================================================================="
           @$(ECHO) "TestMakefile: The \"tests\" rule is being deprecated."
           @$(ECHO) "              Use \"make testusage\" for a description of the usage model."
           @$(ECHO) "              The equivalent new rule is \"alltests\"."
           @$(ECHO) "              Invoking the \"alltests\" rule now."
           @$(ECHO) "==================================================================="
   
   
   shortsleep: FORCE
           @$(SLEEP) 5
   
   ####################
   #
   # unittests
   #
   unittests: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile tests         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile tests
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run          @ $(ECHO) "+++++ TestMakefile unittests complete"
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/tests -f Makefile test_setup  
   #####################
   #
   # servertests
   #
  
 poststarttestsclean:  servertestsclean: FORCE
           $(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
  
 poststarttests: poststarttestsclean  servertestssetup: FORCE
         $(CIMSERVER_START_SERVICE)  ifdef PEGASUS_HAS_SSL
   #
   # The association between user names and certificates is stored in the
   # repository.  If the repository is recreated, we also need to re-initialize
   # the trust store directories. Otherwise, the truststore content will be
   # out-of-sync with the mapping stored in the repository.
   #
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile removeSSLTrustDirectories
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile createSSLTrustDirectories
   endif
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart
         $(SLEEP) 5         $(SLEEP) 5
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile ConfigureUsers
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile Create_SSL_Certificate
   
   
   servertests: servertestsclean servertestssetup serversuite
           @ $(ECHO) "+++++ TestMakefile servertests suites complete"
   
   serversuite: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests
         $(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
  
 tests: $(TESTS)  ####################
   #
   # 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
   #
   # - 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
   
   
   ####################
   #
   # alltests
   #
   alltests: unittests servertests
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC) ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
         $(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
         @ $(ECHO) Finished Tests          @ $(ECHO) "+++++ TestMakefile alltests Complete"
  
 ############################################################################### ###############################################################################
 ##  Test Suite Definitions ##  Test Suite Definitions
Line 150 
Line 318 
 ## ##
 ##  Configuration Options: forceProviderProcesses=true ##  Configuration Options: forceProviderProcesses=true
 ## ##
   ##  If PEGASUS_DEFAULT_ENABLE_OOP is set, then tests are run with OOP disabled
   ##  since tests have already been run with OOP enabled.
   ##
   ##
 ############################################################################### ###############################################################################
   ifeq ($(PEGASUS_DEFAULT_ENABLE_OOP),true)
   OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false
   else
 OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true
   endif
   
 OOP_TS1_TEST_CMDS = \ OOP_TS1_TEST_CMDS = \
         TestClient          $(MAKE)@@--directory=$(PEGASUS_ROOT)@@Makefile@@-s@@poststarttests
  
 run_OOP_TS1: run_OOP_TS1:
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(OOP_TS1_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(OOP_TS1_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(OOP_TS1_TEST_CMDS)"             TESTSUITE_CMDS="$(OOP_TS1_TEST_CMDS)"
   
 ############################################################################### ###############################################################################
  
 ############################################################################### ###############################################################################
Line 182 
Line 360 
             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_TS1a_CONFIG_OPTIONS = enableHttpsConnection=true enableAuthentication=false
   INDSSL_TS1a_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/IndicationStressTestProvider/testclient@@-f@@Makefile@@run_TS1_AuthenticationDisabled
   
   INDSSL_TS1b_CONFIG_OPTIONS = enableHttpsConnection=true enableAuthentication=true sslClientVerificationMode=required
   INDSSL_TS1b_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/IndicationStressTestProvider/testclient@@-f@@Makefile@@run_TS1_AuthenticationEnabled
   
   
   ifdef PEGASUS_HAS_SSL
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
   run_INDSSL_TS1: EnableUsers Create_SSL_Certificate_ignore
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1a_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(INDSSL_TS1a_TEST_CMDS)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1b_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(INDSSL_TS1b_TEST_CMDS)"
   else
   run_INDSSL_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_INDSSL_TS1"
   endif
   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 195 
Line 409 
 SSL_TS1_TEST_CMDS = \ SSL_TS1_TEST_CMDS = \
        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/tests@@SSLCertificateTest1        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/tests@@SSLCertificateTest1
  
 run_SSL_TS1:  ifdef PEGASUS_HAS_SSL
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
   run_SSL_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_TS1_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(SSL_TS1_TEST_CMDS)"             TESTSUITE_CMDS="$(SSL_TS1_TEST_CMDS)"
   else
   run_SSL_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_SSL_TS1"
   endif
   else
   run_SSL_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_HAS_SSL not defined: Skipping run_SSL_TS1 poststarttest"
   
   endif
   
   ############################################################################
   #
   # Create_SSL_Certificate
   #
   # create a certificate that can be used for certification testing.
   # It is currently used by the following tests:
   #            -run_INDSSL_TS1
   #
   Create_SSL_Certificate_ignore: FORCE
           -$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile Create_SSL_Certificate
   
   Create_SSL_Certificate: FORCE
   ifdef PEGASUS_HAS_SSL
   ifdef PEGASUS_TEST_USER_DEFINED
           $(ECHO) "Creating SSL certificate for test"
           ssltrustmgr -a -c $(PEGASUS_TEST_USER_ID) -f $(PEGASUS_HOME)/server.pem
   endif
   else
           $(ECHO) "PEGASUS_HAS_SSL not defined - Not Creating SSL certificate for test"
   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 299 
Line 564 
 ## ##
 ## TestXMLRepo ## TestXMLRepo
 ## ##
 TestXMLRepo: poststarttestsclean  TestXMLRepo: servertestsclean
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestXMLStartServer         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestXMLStartServer
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests REPOSITORY_NAME=repository_xml REPOSITORY_MODE=XML         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests REPOSITORY_NAME=repository_xml REPOSITORY_MODE=XML
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
Line 404 
Line 669 
 ## ##
 ## TestBinRepo ## TestBinRepo
 ## ##
 TestBinRepo: poststarttestsclean  TestBinRepo: servertestsclean
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinStartServer         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinStartServer
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests REPOSITORY_NAME=repository_bin REPOSITORY_MODE=BIN         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests REPOSITORY_NAME=repository_bin REPOSITORY_MODE=BIN
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
Line 436 
Line 701 
 ## ##
 ## Trace Configuration ## Trace Configuration
 ## ##
   ## Options: see usagetrace rule
   ##
   ###############################################################################
   
   usagetrace: FORCE
           $(USAGE)
           $(USAGE)"TestMakefile Trace Commands: "
           $(USAGE)"  The cimserver must be running when using W=c which is the default for W"
           $(USAGE)
           $(USAGE)" traceon  W=[current/planned(c,p):   Enables all tracing."
           $(USAGE)" traceoff W=[current/planned(c,p):   Disables all tracing."
           $(USAGE)" tracesettings:                      Displays all trace settings."
           $(USAGE)" tracecomp:                          Displays a trace componenets list."
           $(USAGE)" traceon-CL C=[comp] L=[level(1,2,3,4)] W=[current/planned(c,p): "
           $(USAGE)"                           Enables tracing on component C at trace level L."
           $(USAGE)
           $(USAGE)" W defaults to c in the above commands where W can be specified"
           $(USAGE)
           $(USAGE)"  Usage examples:"
           $(USAGE)"   traceon       turns on trace in current server config"
           $(USAGE)"   traceon W=c   turns on trace in current server config"
           $(USAGE)"   traceon W=p   turns on trace in planned server config"
           $(USAGE)"   traceoff      turns on trace in current server config"
           $(USAGE)"   traceoff W=c  turns on trace in current server config"
           $(USAGE)"   traceoff W=p  turns on trace in planned server config"
           $(USAGE)
           $(USAGE)"   traceon-CL C=DiscardedData L=3 W=c"
           $(USAGE)"     Turns on trace for DiscardedData at level 3 in current server config"
           $(USAGE)"   traceon-CL C=DiscardedData L=3 W=p"
           $(USAGE)"     Turns on trace for DiscardedData at level 3 in planned server config"
           $(USAGE)
           $(USAGE)
   
   traceon: FORCE
           @ cimconfig -s traceComponents=ALL -$W
           @ cimconfig -s traceLevel=3 -$W
           $(MAKE) -f $(ROOT)/TestMakefile tracesettings
   
   
   traceoff: FORCE
           @ cimconfig -s traceComponents=  -$W
           $(MAKE) -f $(ROOT)/TestMakefile tracesettings
   
   
   tracesettings: FORCE
           @ $(ECHO) " "
           cimconfig -g traceComponents -c -p
           @ $(ECHO) " "
           cimconfig -g traceLevel -c -p
           @ $(ECHO) " "
           cimconfig -g traceFilePath -c -p
           @ $(ECHO) " "
   
   traceon-CL: FORCE
           @ cimconfig -s traceComponents=$C -$W
           @ cimconfig -s traceLevel=$L -$W
           $(MAKE) -f $(ROOT)/TestMakefile tracesettings
   
   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 465 
Line 843 
         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  
         cimconfig -g traceLevel  
  
 list:  list: tracesettings
         cimconfig -g traceComponents  
         cimconfig -g traceLevel  
         cimconfig -g traceFilePath  
  
 # More options...  #########################################################################
   # standardtests
   #
   # More testing options...
   #
   # The standard test seem to contain additional test that may not be able
   # to run on all platforms so they have been grouped here for now rather than
   # being included in the serversuite rule.
   #
   # The test are:
   #      TestCimmof
   #      TestNoSecurity
   #      TestLocalSecurity
   #      TestRemoteSecurity
   #      TestAuthorization
   #
   # NOTE: The TestsNoSecurity test is comprised of DisableSecurity and
   #       TestNoSecurity.
   #
   # NOTE: The TestNoSecurity step runs the servertests which builds the
   #       the repository that is then left in place for the remaining tests.
   #       The cimof test must be before the TestNosecurity step as it removes
   #       the repository builds a new one with cimmofl and another one with
   #       cimmof and then compares them.
   #
   # NOTE: The Authentication test is comprised of EnableAuthentication,
   #       TestLocalSecurity and TestRemoteSecurity.
   #
   # NOTE: The Authorization test is comprised of EnableAuthorization and
   #       TestAuthorization.
   #
   # NOTE: The EnableAuthentication and EnableAuthorization steps require
   #       root access. Pegasus doesn't currently have the infrastructure
   #       in place to run the server as root and run the test as non-root.
   #       Rather than run everything, server, tests, providers, clients etc.
   #       as root many testers prefer to run the tests as non-root. Setting
   #       PEGASUS_DISABLE_PRIVILEGED_TESTS in the environment helps to
   #       facilitate that.
   #
  
 standardtests:  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
   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
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestRemoteSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestRemoteSecurity
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthorization         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthorization
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestAuthorization         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestAuthorization
   else
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthentication, TestLocalSecurity, and TestRemoteSecurity "
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthorization and TestAuthorization "
   endif
           @ $(ECHO) "+++++ TestMakefile standardtests complete"
  
 TestNoSecurity: TestNoSecurity:
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile tests          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile servertests
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithoutSSL         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithoutSSL
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile RunTestClientLocal         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile RunTestClientLocal
  
Line 503 
Line 915 
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile poststarttests HOSTNAME= PORT= USER= PASSWORD= SECURITY_ENABLED=true         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile poststarttests HOSTNAME= PORT= USER= PASSWORD= SECURITY_ENABLED=true
  
 TestRemoteSecurity: TestRemoteSecurity:
         TestClient -user guest -password guest $(system):5988          TestClient -user $(PEGASUS_TEST_USER_ID) -password $(PEGASUS_TEST_USER_PASS) $(system):5988
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest/static -f Makefile poststarttests HOSTNAME=-h$(system) USER=-uguest PASSWORD=-wguest SECURITY_ENABLED=true          $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest/static -f Makefile poststarttests HOSTNAME=-h$(system) USER=-u$(PEGASUS_TEST_USER_ID) PASSWORD=-w$(PEGASUS_TEST_USER_PASS) SECURITY_ENABLED=true
  
 TestAuthorization: TestAuthorization:
         DeleteNamespace -a -user guest -password guest          TestPegClientDeleteNamespace -a -user $(PEGASUS_TEST_USER_ID) -password $(PEGASUS_TEST_USER_PASS)
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile RunTestClientLocal         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile RunTestClientLocal
         TestClient -user guest -password guest $(system):5988          TestClient -user $(PEGASUS_TEST_USER_ID) -password $(PEGASUS_TEST_USER_PASS) $(system):5988
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest/static -f Makefile poststarttests HOSTNAME=-h$(system) USER=-uguest PASSWORD=-wguest SECURITY_ENABLED=true          $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest/static -f Makefile poststarttests HOSTNAME=-h$(system) USER=-u$(PEGASUS_TEST_USER_ID) PASSWORD=-w$(PEGASUS_TEST_USER_PASS) SECURITY_ENABLED=true
  
 TestSubscriptions: TestSubscriptions:
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile DisableSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile DisableSecurity
Line 531 
Line 943 
         cimconfig -s enableAuthentication=false -p         cimconfig -s enableAuthentication=false -p
         cimconfig -s enableNamespaceAuthorization=false -p         cimconfig -s enableNamespaceAuthorization=false -p
  
   EnableUsers:
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithoutSSL
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile ConfigureUsers
   
 EnableAuthentication: EnableAuthentication:
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         cimconfig -s enableAuthentication=true -p         cimconfig -s enableAuthentication=true -p
Line 547 
Line 964 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithSSL         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithSSL
  
   #
   # ConfigureUsers
   #
   # The server must be running prior to invoking this rule
   #
 ConfigureUsers: ConfigureUsers:
 ifndef PEGASUS_PAM_AUTHENTICATION ifndef PEGASUS_PAM_AUTHENTICATION
         cimuser -a -u guest -w guest          -cimuser -l
           -cimuser -a -u $(PEGASUS_TEST_USER_ID) -w $(PEGASUS_TEST_USER_PASS)
 endif endif
  
   #
   # ConfigureAuthorizations rule
   #
   # The server must be running prior to invoking this rule
   #
 ConfigureAuthorizations: ConfigureAuthorizations:
         cimauth -a -u guest -n test/cimv2 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test/cimv2 -R -W
         cimauth -a -u guest -n root/cimv2 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/cimv2 -R -W
         cimauth -a -u guest -n root/PG_Internal -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/PG_Internal -R -W
         cimauth -a -u guest -n root/PG_InterOp -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/PG_InterOp -R -W
         cimauth -a -u guest -n root/benchmark -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/benchmark -R -W
         cimauth -a -u guest -n root/sampleprovider -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/sampleprovider -R -W
         cimauth -a -u guest -n test/static -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test/static -R -W
         cimauth -a -u guest -n root/SampleProvider -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/SampleProvider -R -W
         cimauth -a -u guest -n root -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root -R -W
         cimauth -a -u guest -n test1 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/test/A -R -W
         cimauth -a -u guest -n test2 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/test/B -R -W
         cimauth -a -u guest -n test3 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test/TestProvider -R -W
         cimauth -a -u guest -n test4 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1 -R -W
         cimauth -a -u guest -n test5 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test2 -R -W
         cimauth -a -u guest -n test6 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test3 -R -W
         cimauth -a -u guest -n test1/test2 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test4 -R -W
         cimauth -a -u guest -n test1/test2/test3 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test5 -R -W
         cimauth -a -u guest -n test1/test2/test3/test4 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test6 -R -W
         cimauth -a -u guest -n test1/test2/test3/test4/test5 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1/test2 -R -W
         cimauth -a -u guest -n test1/test2/test3/test4/test5/test6 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1/test2/test3 -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/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
   
   ############################
   #
   # Target for OpenPegasus Stress Tests (PEP#241)
   #
   #    The stresstest target will run the stress tests
   
   stresstests:
           @$(ECHO) "Running PEGASUS StressTests"
           @$(MAKE) "-SC" test/StressTestController/tests stresstests


Legend:
Removed from v.1.38.2.2  
changed lines
  Added in v.1.65.2.1

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2