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

Diff for /pegasus/TestMakefile between version 1.57 and 1.100

version 1.57, 2006/01/30 16:16:16 version 1.100, 2008/12/02 08:59:54
Line 1 
Line 1 
 #//%2006////////////////////////////////////////////////////////////////////////  #//%LICENSE////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  #// Licensed to The Open Group (TOG) under one or more contributor license
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  #// agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  #// this work for additional information regarding copyright ownership.
 #// IBM Corp.; EMC Corporation, The Open Group.  #// Each contributor licenses this file to you under the OpenPegasus Open
 #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  #// Source License; you may not use this file except in compliance with the
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  #// License.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 #// 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
 #// of this software and associated documentation files (the "Software"), to  #// copy of this software and associated documentation files (the "Software"),
 #// deal in the Software without restriction, including without limitation the  #// to deal in the Software without restriction, including without limitation
 #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  #// the rights to use, copy, modify, merge, publish, distribute, sublicense,
 #// sell copies of the Software, and to permit persons to whom the Software is  #// and/or sell copies of the Software, and to permit persons to whom the
 #// furnished to do so, subject to the following conditions:  #// Software is furnished to do so, subject to the following conditions:
 #// #//
 #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  #// The above copyright notice and this permission notice shall be included
 #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  #// in all copies or substantial portions of the Software.
 #// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 #// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 #// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 #// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 #// #//
 #//==============================================================================  #// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   #// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   #// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   #// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   #// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   #// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   #// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   #//
   #//////////////////////////////////////////////////////////////////////////
 ############################################################################### ###############################################################################
 ## ##
 ## Test Makefile for Pegasus CIMOM ## Test Makefile for Pegasus CIMOM
Line 63 
Line 61 
         $(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"
         $(USAGE)"usagetrace         - usage on trace targets"         $(USAGE)"usagetrace         - usage on trace targets"
           $(USAGE)"stresstests        - Execute the default stress test suite"
         $(USAGE)         $(USAGE)
  
 usage2: FORCE usage2: FORCE
Line 92 
Line 90 
         $(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)
         $(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)"slptests                - Executes the slptests"
           $(USAGE)"run_Cmpi_Sub            - Executes the CMPI subscription tests"
         $(USAGE)         $(USAGE)
  
  
Line 124 
Line 126 
 depend: FORCE depend: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile depend         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile depend
  
   ###############################################################################
   #   mak/certificate_test.mak implements three key functions for
   #   testing Certificate-Based Authentication (CBA).
   #
   #   setupCBATestCertificates is used to create a set of test certificates
   #       make -f TestMakefile setupCBATestCertificates
   #
   #   runCBATestSuites is used to run a set of CBA tests
   #       make -f TestMakefile runCBATestSuites
   #
   #   cleanupCBATestCertificates can be used to remove the test certificates
   #       make -f TestMakefile cleanupCBATestCertificates
   ###############################################################################
   include $(PEGASUS_ROOT)/mak/certificate_test.mak
  
 ############################################################ ############################################################
 # #
Line 156 
Line 172 
 repositoryServer: FORCE 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)          $(RMREPOSITORY) $(REPOSITORY_ROOT)
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart         $(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
Line 232 
Line 248 
  
 servertestssetup: FORCE servertestssetup: FORCE
 ifdef PEGASUS_HAS_SSL 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.  # The association between user names and certificates is stored in the
 # Otherwise, the truststore content will be out-of-sync with the mapping stored in the  # repository.  If the repository is recreated, we also need to re-initialize
 # repository.  # the trust store directories. Otherwise, the truststore content will be
   # 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
         $(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
           @$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
               cleanupCBATestCertificates
           @$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
               setupCBATestCertificates
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart
         $(SLEEP) 5         $(SLEEP) 5
 ifdef PEGASUS_HAS_SSL          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile ConfigureUsers
 ifdef PEGASUS_TEST_USER_DEFINED          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile Create_SSL_Certificate
         ssltrustmgr -a -c pegtest -f $(PEGASUS_HOME)/server.pem  ifeq ($(PEGASUS_TEST_SDK),true)
 endif          $(MAKE) --directory=$(PEGASUS_ROOT)/src/SDK/samples -f Makefile setupSDK
 endif endif
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstop
   
   # 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"
  
 serversuite: FORCE serversuite: FORCE
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Server/tests -f Makefile commandtests
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart
         $(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_Cimsub_InterOp
         $(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_OOPProvFail_TS1
           $(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_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 run_SDK_TS1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_ExportClientSSL_TS1
   ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER),true)
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_Cmpi_Sub
   endif
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_idleConnectionTimeout1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_idleConnectionTimeout2
  
 ####################  #####################
 # #
 # serverquicktests  # stresstests
 # #
 serverquicktests: servertestsclean servertestssetup serverquicksuite  stresstests:
         @ $(ECHO) "+++++ TestMakefile serverquicktests complete"          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_STRESS_TS1
   
 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 TestBenchmark
 # - runs cimperf to displat the statistics # - runs cimperf to displat the statistics
 # - turns statistics off # - turns statistics off
 # #
Line 290 
Line 335 
         @ $(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 303 
Line 348 
 # 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 329 
Line 374 
 OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true
 endif endif
  
   ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
       # When privilege separation is enabled, most providers run out of process
       # regardless of the forceProviderProcesses setting.  The exception is
       # providers that register with UserContext = 5 (CIM Server).  The only
       # case of this in the automated tests is the UserContextTestProvider.
 OOP_TS1_TEST_CMDS = \ OOP_TS1_TEST_CMDS = \
         $(MAKE)@@--directory=$(PEGASUS_ROOT)@@Makefile@@-s@@poststarttests          $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/UserContextTestProvider/testclient@@poststarttests
   else
       OOP_TS1_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)@@-f@@Makefile@@poststarttests
   endif
  
 run_OOP_TS1: run_OOP_TS1:
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
Line 360 
Line 414 
             TESTSUITE_CMDS="$(IndInit_TS1b_TEST_CMDS)"             TESTSUITE_CMDS="$(IndInit_TS1b_TEST_CMDS)"
  
 ############################################################################### ###############################################################################
   ##  OOPProvFail Test Suite 1: OOP Provider Module Failure Tests
   ##
   ##  Configuration Options: forceProviderProcesses=true
   ##  enableAuthentication=true, enableAuthentication=false
   ##
   ##  NOTE: Regardless of the setting of PEGASUS_DEFAULT_ENABLE_OOP, this test
   ##  suite is always run with OOP enabled.  This test suite causes a provider to
   ##  exit.  Running this test suite with OOP disabled would cause the cimserver
   ##  to exit and the test suite to fail.
   ##
   ##  NOTE: The test is run once with authentication enabled, and once without
   ##  authentication enabled.
   ##
   ###############################################################################
   OOPProvFail_TS1a_CONFIG_OPTIONS = forceProviderProcesses=true enableAuthentication=true
   OOPProvFail_TS1b_CONFIG_OPTIONS = forceProviderProcesses=true enableAuthentication=false
   OOPProvFail_TS1_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS1
   
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
   run_OOPProvFail_TS1:
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS1a_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(OOPProvFail_TS1_TEST_CMDS)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS1b_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(OOPProvFail_TS1_TEST_CMDS)"
   else
   run_OOPProvFail_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_OOPProvFail_TS1"
   endif
   
   ###############################################################################
   ##  OOPProvFail Test Suite 2: OOP Provider Module Failure on IndicationService
   ##                            Initialization Tests
   ##
   ##  Configuration Options: forceProviderProcesses=true
   ##                         enableAuthentication=true
   ##
   ##  NOTE: Regardless of the setting of PEGASUS_DEFAULT_ENABLE_OOP, this test
   ##  suite is always run with OOP enabled.  This test suite causes a provider to
   ##  exit.  Running this test suite with OOP disabled would cause the cimserver
   ##  to exit and the test suite to fail.
   ##
   ###############################################################################
   OOPProvFail_TS2_CONFIG_OPTIONS = forceProviderProcesses=true enableAuthentication=true
   OOPProvFail_TS2a_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS2a
   OOPProvFail_TS2b_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS2b
   
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
   run_OOPProvFail_TS2:
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS2_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(OOPProvFail_TS2a_TEST_CMDS)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS2_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(OOPProvFail_TS2b_TEST_CMDS)"
   else
   run_OOPProvFail_TS2: FORCE
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_OOPProvFail_TS2"
   endif
   
   ###############################################################################
   ##  OOPProvFail Test Suite 3: OOP Provider Module Failure CIM Server restart
   ##                            Tests
   ##
   ##  Configuration Options: forceProviderProcesses=true
   ##                         enableAuthentication=true
   ##
   ##  NOTE: Regardless of the setting of PEGASUS_DEFAULT_ENABLE_OOP, this test
   ##  suite is always run with OOP enabled.  This test suite causes a provider to
   ##  exit.  Running this test suite with OOP disabled would cause the cimserver
   ##  to exit and the test suite to fail.
   ##
   ###############################################################################
   OOPProvFail_TS3_CONFIG_OPTIONS = forceProviderProcesses=true enableAuthentication=true
   OOPProvFail_TS3a_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS3a
   OOPProvFail_TS3b_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS3b
   
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
   run_OOPProvFail_TS3:
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS3_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(OOPProvFail_TS3a_TEST_CMDS)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS3_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(OOPProvFail_TS3b_TEST_CMDS)"
   else
   run_OOPProvFail_TS3: FORCE
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_OOPProvFail_TS3"
   endif
   
   ###############################################################################
 ##  Indication SSL Test Suite 1: Indication Testing over HTTPS ##  Indication SSL Test Suite 1: Indication Testing over HTTPS
 ## ##
 ##  Configuration Options: (none) ##  Configuration Options: (none)
Line 376 
Line 527 
  
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
 ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
 run_INDSSL_TS1: FORCE  run_INDSSL_TS1: EnableUsers Create_SSL_Certificate_ignore
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1a_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1a_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(INDSSL_TS1a_TEST_CMDS)"             TESTSUITE_CMDS="$(INDSSL_TS1a_TEST_CMDS)"
Line 396 
Line 547 
 ############################################################################### ###############################################################################
  
 ############################################################################### ###############################################################################
 ##  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 \
         enableAuthentication=false
   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.
   ##
   ##         The IPv4-mapped IPv6 address test is only enabled for unix
   ##         platforms as Windows does not support IPv4-mapped IPv6 addresses
   ##         on certain versions.
   ##
   ###############################################################################
   SSL_IPV6_TS1_CONFIG_OPTIONS = enableHttpsConnection=true \
         enableAuthentication=false
   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)"
         ifeq ($(OS_TYPE), unix)
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(SSL_IPV6_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(SSL_IPV6_TS1_CMD_2)"
         endif
       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 404 
Line 627 
 ##                         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/ssltrustmgr/tests@@SSLCertificateTest1         $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/cimtrust/tests@@SSLCertificateTest1
   SSL_CBA_TS1_TEST_CMD_2 = \
          $(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 \
               CIMSERVER_CONFIG_OPTIONS="$(SSL_CBA_TS1_CONFIG_OPTIONS)" \
               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
  
   ############################################################################
   #
   # 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"
           cimtrust -a -U $(PEGASUS_TEST_USER_ID) -f $(PEGASUS_HOME)/server.pem -Ts
   endif
   else
           $(ECHO) "PEGASUS_HAS_SSL not defined - Not Creating SSL certificate for test"
 endif endif
  
 ############################################################################### ###############################################################################
Line 440 
Line 689 
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(G11N_TS1_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(G11N_TS1_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(G11N_TS1_TEST_CMDS)"             TESTSUITE_CMDS="$(G11N_TS1_TEST_CMDS)"
   
   ###############################################################################
   ##  Stress Test Suite 1:  Default Stress Tests
   ##
   ##  Configuration Options: (none)
   ##
   ###############################################################################
   STRESS_TS1_CONFIG_OPTIONS =
   STRESS_TS1_TEST_CMDS = \
           TestStressTestController
   
   run_STRESS_TS1:
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(STRESS_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(STRESS_TS1_TEST_CMDS)"
   ###############################################################################
   
   ###############################################################################
   ##  SDK Test Suite 1:  SDK Tests
   ##
   ##  Configuration Options: (none)
   ##
   ###############################################################################
   SDK_TS1_CONFIG_OPTIONS =
   SDK_TS1_TEST_CMDS = \
           $(MAKE) --directory $(PEGASUS_ROOT)/src/SDK/samples \
               -f Makefile testSDK
   
   ifeq ($(PEGASUS_TEST_SDK),true)
   run_SDK_TS1: FORCE
           $(MAKE) --directory=$(PEGASUS_ROOT)/mak \
               -f $(PEGASUS_ROOT)/mak/SDKMakefile stageINCLUDE \
               PEGASUS_STAGING_DIR=$(PEGASUS_HOME) \
               PEGASUS_INCLUDE_DIR=/include
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/SDK/samples \
               -f Makefile clean
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/SDK/samples \
               -f Makefile PEGASUS_INCLUDE_DIR=$(PEGASUS_HOME)/include
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(SDK_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(SDK_TS1_TEST_CMDS)"
   else
   run_SDK_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_TEST_SDK is not true: Skipping run_SDK_TS1"
   endif
   ###############################################################################
   
   ###############################################################################
   ##  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
   
 ############################################################################### ###############################################################################
  
  
   
   ###############################################################################
   ##  idleConnectionTimeout Test Suite 1:  uses ChunkingStressProvider Tests
   ##
   ##  Configuration Options: idleConnectionTime=55
   ##
   ###############################################################################
   IDLE_CONNECTION_TIMEOUT_1_CONFIG_OPTIONS = idleConnectionTimeout=55
   IDLE_CONNECTION_TIMEOUT_1_TEST_CMDS = \
           $(MAKE)@@--directory \
               $(PEGASUS_ROOT)/src/Providers/TestProviders/ChunkingStressProvider/testclient \
               -f@@Makefile@@poststarttests
   run_idleConnectionTimeout1: FORCE
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(IDLE_CONNECTION_TIMEOUT_1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(IDLE_CONNECTION_TIMEOUT_1_TEST_CMDS)"
 ############################################################################### ###############################################################################
  
  
   ###############################################################################
   ##  idleConnectionTimeout Test Suite 2:  uses IdleConnectionTimeout client test
   ##
   ##  Configuration Options: idleConnectionTime=6
   ##
   ###############################################################################
   IDLE_CONNECTION_TIMEOUT_2_CONFIG_OPTIONS = idleConnectionTimeout=6
   IDLE_CONNECTION_TIMEOUT_2_TEST_CMDS = \
           $(MAKE)@@--directory \
               $(PEGASUS_ROOT)/src/Pegasus/Client/tests/IdleConnectionTimeout/ \
               -f@@Makefile@@timeoutTest@@IDLETIME=10
   run_idleConnectionTimeout2: FORCE
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(IDLE_CONNECTION_TIMEOUT_2_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(IDLE_CONNECTION_TIMEOUT_2_TEST_CMDS)"
   ###############################################################################
   
   
   ###############################################################################
   ##  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
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(CIMSUB_INTEROP_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(CIMSUB_INTEROP_TEST_CMDS)"
   ###############################################################################
   
   ###############################################################################
   ## CMPI subscription activation Test Suite 1:
   ##
   ## Configuration Options: (none)
   ##
   ###############################################################################
   CMPI_SUB_TEST_CONFIG_OPTIONS=
   CMPI_SUBa_TEST_CMDS = \
           TestIndicationStressTest TestCMPI_IndicationStressTestClass test/TestProvider setup WQL
   CMPI_SUBb_TEST_CMDS = \
           TestIndicationStressTest TestCMPI_IndicationStressTestClass test/TestProvider getSubscriptionCount
   CMPI_SUBc_TEST_CMDS =  \
           TestIndicationStressTest TestCMPI_IndicationStressTestClass test/TestProvider cleanup
   run_Cmpi_Sub: FORCE
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(CMPI_SUB_TEST_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(CMPI_SUBa_TEST_CMDS)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(CMPI_SUB_TEST_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(CMPI_SUBb_TEST_CMDS)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(CMPI_SUB_TEST_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(CMPI_SUBc_TEST_CMDS)"
   
   ##############################################################################
   
  
 ############################################################################## ##############################################################################
 ## ##
Line 686 
Line 1079 
  
 usagetrace: FORCE usagetrace: FORCE
         $(USAGE)         $(USAGE)
         $(USAGE)"TestMakefile Trace Commands: (cimserver should be running)"          $(USAGE)"TestMakefile Trace Commands: "
         $(USAGE)          $(USAGE)"  The cimserver must be running when using W=c which is the default for W"
         $(USAGE)         $(USAGE)
         $(USAGE)" traceon:                  Enables all tracing."          $(USAGE)" traceon  W=[current/planned(c,p):   Enables all tracing."
         $(USAGE)" traceoff:                 Disables all tracing."          $(USAGE)" traceoff W=[current/planned(c,p):   Disables all tracing."
         $(USAGE)" tracesettings:            Displays trace settings."          $(USAGE)" tracesettings:                      Displays all trace settings."
         $(USAGE)" tracecomp:                Displays a trace componenets list."         $(USAGE)" tracecomp:                Displays a trace componenets list."
         $(USAGE)" traceon-CL C=[comp] L=[level(1,2,3,4)]:  "          $(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)"                           Enables tracing on component C at trace level L."
         $(USAGE)"                           Usage example:"          $(USAGE)
         $(USAGE)"                           Turns tracing on for DiscardedData at level 3"          $(USAGE)" W defaults to c in the above commands where W can be specified"
         $(USAGE)"                           traceon-CL C=DiscardedData L=3"          $(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)
         $(USAGE)         $(USAGE)
  
 traceon: FORCE traceon: FORCE
         @ cimconfig -s traceComponents=ALL          @ cimconfig -s traceComponents=ALL -$W
         @ cimconfig -s traceLevel=3 -c          @ cimconfig -s traceLevel=3 -$W
         @ cimconfig -g traceComponents          $(MAKE) -f $(ROOT)/TestMakefile tracesettings
         @ cimconfig -g traceLevel  
  
 traceoff: FORCE traceoff: FORCE
         @ cimconfig -s traceComponents=          @ cimconfig -s traceComponents=  -$W
         @ cimconfig -g traceComponents          $(MAKE) -f $(ROOT)/TestMakefile tracesettings
         @ cimconfig -g traceLevel  
  
  
 tracesettings: FORCE tracesettings: FORCE
         @ $(ECHO) " "         @ $(ECHO) " "
         cimconfig -g traceComponents          cimconfig -g traceComponents -c -p
         @ $(ECHO) " "         @ $(ECHO) " "
         cimconfig -g traceLevel          cimconfig -g traceLevel -c -p
         @ $(ECHO) " "         @ $(ECHO) " "
         cimconfig -g traceFilePath          cimconfig -g traceFilePath -c -p
         @ $(ECHO) " "         @ $(ECHO) " "
  
 traceon-CL: FORCE traceon-CL: FORCE
         @ cimconfig -s traceComponents=$C -c          @ cimconfig -s traceComponents=$C -$W
         @ cimconfig -s traceLevel=$L -c          @ cimconfig -s traceLevel=$L -$W
         @ cimconfig -g traceComponents          $(MAKE) -f $(ROOT)/TestMakefile tracesettings
         @ cimconfig -g traceLevel  
  
 tracecomp: FORCE tracecomp: FORCE
         $(USAGE)         $(USAGE)
Line 771 
Line 1174 
         $(USAGE)"ControlProvider"         $(USAGE)"ControlProvider"
         $(USAGE)"AsyncOpNode"         $(USAGE)"AsyncOpNode"
         $(USAGE)"CIMOMHandle"         $(USAGE)"CIMOMHandle"
         $(USAGE)"BinaryMessageHandler"  
         $(USAGE)"L10N"         $(USAGE)"L10N"
         $(USAGE)"ExportClient"         $(USAGE)"ExportClient"
         $(USAGE)"Listener"         $(USAGE)"Listener"
Line 861 
Line 1263 
 standardtests: FORCE 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
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository testrepository
 ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS 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
Line 872 
Line 1275 
         @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthentication, TestLocalSecurity, and TestRemoteSecurity "         @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthentication, TestLocalSecurity, and TestRemoteSecurity "
         @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthorization and TestAuthorization "         @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthorization and TestAuthorization "
 endif endif
           # Reset the security options to the defaults
           cimconfig -u enableNamespaceAuthorization -p
           cimconfig -u enableAuthentication -p
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         @ $(ECHO) "+++++ TestMakefile standardtests complete"         @ $(ECHO) "+++++ TestMakefile standardtests complete"
  
 TestNoSecurity: TestNoSecurity:
Line 884 
Line 1291 
         $(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 902 
Line 1309 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstop
  
 TestCimmof: TestCimmof:
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Testcimmof poststarttests          # Build the repository with cimmofl and cimmof and compare them.
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
           -@$(MOVE) $(REPOSITORY_DIR)/repository $(REPOSITORY_DIR)/repository-save
           @$(RMREPOSITORY) $(REPOSITORY_DIR)/repository-cimmofl
           @$(RMREPOSITORY) $(REPOSITORY_DIR)/repository-cimmof
           @$(ECHO) $(CIM_SCHEMA_DIR)
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository
           @$(MOVE) $(REPOSITORY_DIR)/repository $(REPOSITORY_DIR)/repository-cimmofl
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart
           @$(ECHO) $(CIM_SCHEMA_DIR)
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryServer
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstop
           @$(MOVE) $(REPOSITORY_DIR)/repository $(REPOSITORY_DIR)/repository-cimmof
           -@$(MOVE) $(REPOSITORY_DIR)/repository-save $(REPOSITORY_DIR)/repository
           TestCompareRepositories $(REPOSITORY_DIR)/repository-cimmofl $(REPOSITORY_DIR)/repository-cimmof
           @$(RMREPOSITORY) $(REPOSITORY_DIR)/repository-cimmofl
           @$(RMREPOSITORY) $(REPOSITORY_DIR)/repository-cimmof
  
 RunTestClientLocal: RunTestClientLocal:
         TestClient -local         TestClient -local
Line 912 
Line 1335 
         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 928 
Line 1356 
         $(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/MCCAtest/A -R -W
         cimauth -a -u guest -n test2 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/MCCAtest/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
   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
Line 962 
Line 1407 
 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) 5
   
   ###############################################################################
   ##
   ## check_for_cores - used to search for core files in the build environment.
   ##
   ## This option will search (1) each source directory, (2) the PEGASUS_CORE_DIR
   ## if it is defined and (3) the PEGASUS_TMP directory.
   ##
   ###############################################################################
   CORE_FILE_LIST = $(PEGASUS_HOME)/CoreFileList
   
   check_core_search_results:
   ifneq ($(wildcard $(CORE_FILE_LIST)), )
           @$(ECHO) "*** One or more core files found. ***"
           @$(CAT) $(CORE_FILE_LIST)
           @exit 1
   endif
   
   ifdef PEGASUS_CORE_DIR
      CORE_FILES_IN_CORE_DIR = \
          $(wildcard $(PEGASUS_CORE_DIR)/$(PLATFORM_CORE_PATTERN))
   endif
   ifdef PEGASUS_TMP
      CORE_FILES_IN_TMP_DIR = \
          $(wildcard $(PEGASUS_TMP)/$(PLATFORM_CORE_PATTERN))
   endif
   
   generate_core_file_list:
           @$(RM) $(CORE_FILE_LIST)
           @$(MAKE) -s directory=$(PEGASUS_ROOT) general OPTION=CORE_SEARCH \
               CORE_FILE_LIST=$(CORE_FILE_LIST)
   ifdef PEGASUS_CORE_DIR
      ifneq ($(CORE_FILES_IN_CORE_DIR), )
           @$(ECHO) $(CORE_FILES_IN_CORE_DIR) >> $(CORE_FILE_LIST)
      endif
   endif
   ifdef PEGASUS_TMP
      ifneq ($(CORE_FILES_IN_TMP_DIR), )
           @$(ECHO) $(CORE_FILES_IN_TMP_DIR) >> $(CORE_FILE_LIST)
      endif
   endif
   
   check_for_cores:
           @$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
               generate_core_file_list
           @$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
               check_core_search_results

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