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

Diff for /pegasus/TestMakefile between version 1.76 and 1.106

version 1.76, 2006/10/20 19:19:45 version 1.106, 2010/11/02 05:27:57
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"
Line 93 
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)"run_STRESS_TS1          - Executes the stresstests"
           $(USAGE)"slptests                - Executes the slptests"
           $(USAGE)"run_Cmpi_Sub            - Executes the CMPI subscription tests"
         $(USAGE)         $(USAGE)
  
  
Line 172 
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 274 
Line 274 
 ifeq ($(PEGASUS_TEST_SDK),true) ifeq ($(PEGASUS_TEST_SDK),true)
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/SDK/samples -f Makefile setupSDK         $(MAKE) --directory=$(PEGASUS_ROOT)/src/SDK/samples -f Makefile setupSDK
 endif endif
           $(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_Cimsub_InterOp
Line 290 
Line 298 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOPProvFail_TS2         $(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_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 runCBATestSuites
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_SDK_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_SDK_TS1
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_ExportClientSSL_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_ExportClientSSL_TS1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_Cimserver_Availability
   ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER),true)
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_Cmpi_Sub
   endif
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimprovagt32tests
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_idleConnectionTimeout1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_idleConnectionTimeout2
  
 ##################### #####################
 # #
Line 305 
Line 322 
  
 #################### ####################
 # #
 # serverquicktests  
 #  
 serverquicktests: servertestsclean servertestssetup serverquicksuite  
         @ $(ECHO) "+++++ TestMakefile serverquicktests complete"  
   
 serverquicksuite: FORCE  
         $(PEGASUS_HOME)/bin/Client  
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile poststarttests  
         $(PEGASUS_HOME)/bin/TestClient  
   
 ####################  
 #  
 # perftests - simple performance test until we have better # perftests - simple performance test until we have better
 # #
 # - Turns statistics on (uses TestInterop until we have better) # - Turns statistics on (uses TestInterop until we have better)
 # - runs and times serverquicktests suite  # - runs poststarttests suite and TestBenchmark
 # - runs cimperf to displat the statistics # - runs cimperf to displat the statistics
 # - turns statistics off # - turns statistics off
 # #
Line 332 
Line 337 
         @ $(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 345 
Line 350 
 # 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 371 
Line 376 
 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 = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/UserContextTestProvider/testclient@@poststarttests
   else
 OOP_TS1_TEST_CMDS = \ OOP_TS1_TEST_CMDS = \
         $(MAKE)@@--directory=$(PEGASUS_ROOT)@@Makefile@@-s@@poststarttests          $(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 416 
Line 430 
 ##  authentication enabled. ##  authentication enabled.
 ## ##
 ############################################################################### ###############################################################################
 OOPProvFail_TS1a_CONFIG_OPTIONS = forceProviderProcesses=true enableAuthentication=true  OOPProvFail_TS1a_CONFIG_OPTIONS = forceProviderProcesses=true enableAuthentication=true maxFailedProviderModuleRestarts=0
 OOPProvFail_TS1b_CONFIG_OPTIONS = forceProviderProcesses=true enableAuthentication=false  OOPProvFail_TS1b_CONFIG_OPTIONS = forceProviderProcesses=true enableAuthentication=false maxFailedProviderModuleRestarts=0
 OOPProvFail_TS1_TEST_CMDS = \ OOPProvFail_TS1_TEST_CMDS = \
         $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS1         $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS1
  
Line 479 
Line 493 
 ##  to exit and the test suite to fail. ##  to exit and the test suite to fail.
 ## ##
 ############################################################################### ###############################################################################
 OOPProvFail_TS3_CONFIG_OPTIONS = forceProviderProcesses=true enableAuthentication=true  OOPProvFail_TS3_CONFIG_OPTIONS = forceProviderProcesses=true enableAuthentication=true maxFailedProviderModuleRestarts=0
 OOPProvFail_TS3a_TEST_CMDS = \ OOPProvFail_TS3a_TEST_CMDS = \
         $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS3a         $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS3a
 OOPProvFail_TS3b_TEST_CMDS = \ OOPProvFail_TS3b_TEST_CMDS = \
Line 535 
Line 549 
 ############################################################################### ###############################################################################
  
 ############################################################################### ###############################################################################
 ##  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 543 
Line 629 
 ##                         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/cimtrust/tests@@SSLCertificateTest1        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/cimtrust/tests@@SSLCertificateTest1
 SSL_TS2_TEST_CMDS = \  SSL_CBA_TS1_TEST_CMD_2 = \
        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/cimcrl/tests@@SSLCRLTest1        $(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 \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(SSL_TS1_CONFIG_OPTIONS)" \              CIMSERVER_CONFIG_OPTIONS="$(SSL_CBA_TS1_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(SSL_TS2_TEST_CMDS)"              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 endif
  
Line 677 
Line 763 
  
  
 ############################################################################### ###############################################################################
   ##  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)"
   ###############################################################################
   
   ###############################################################################
   ##  cimserver thread limit test:
   ##
   ##  Configuration Options: none
   ##
   ###############################################################################
   CIMSERVER_THREAD_LIMIT_TEST_CONFIG_OPTIONS = forceProviderProcesses=true
   CIMSERVER_THREAD_LIMIT_TEST_CMDS = \
          $(MAKE)@@--directory \
               $(PEGASUS_ROOT)/src/Providers/TestProviders/FaultyInstanceProvider/testclient \
               -f@@Makefile@@runAvailabilityTest
   run_Cimserver_Availability: FORCE
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(CIMSERVER_THREAD_LIMIT_TEST_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(CIMSERVER_THREAD_LIMIT_TEST_CMDS)"
   ###############################################################################
   
   ###############################################################################
 ##  cimsub CLI Test Suite 1:  PG_InterOp Tests ##  cimsub CLI Test Suite 1:  PG_InterOp Tests
 ## ##
 ##  Configuration Options: (none) ##  Configuration Options: (none)
Line 694 
Line 831 
 ############################################################################### ###############################################################################
  
 ############################################################################### ###############################################################################
   ## 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)"
  
   ##############################################################################
  
  
   #############################################################################
   ##
   ## 32-bit provider tests on 64-bit CIMServer
   ##
   #############################################################################
   
   TEST_32BIT_CONFIG_OPTIONS = providerDir=lib32:lib
   TEST_32BIT_CMDS = \
          $(MAKE)@@--directory \
               $(PEGASUS_ROOT)/src/Providers/TestProviders -f@@Makefile.cimprovagt32tests@@cimprovagt32tests
   cimprovagt32tests: FORCE
   ifdef PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(TEST_32BIT_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(TEST_32BIT_CMDS)"
   else
           @$(ECHO) "PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT not defined, skipping 32-bit tests..."
   endif
   
 ############################################################################## ##############################################################################
 ## ##
 ## TestXMLRepository rule is used to run the poststarttests suite on ## TestXMLRepository rule is used to run the poststarttests suite on
Line 925 
Line 1104 
         @ $(MAKE) "-SC" $(ROOT)/src/Pegasus/Repository depend         @ $(MAKE) "-SC" $(ROOT)/src/Pegasus/Repository depend
         @ $(MAKE) "-SC" $(ROOT)/src/Pegasus/Repository         @ $(MAKE) "-SC" $(ROOT)/src/Pegasus/Repository
  
   
 ############################################################################### ###############################################################################
 ## ##
 ## Trace Configuration ## Trace Configuration
Line 1031 
Line 1209 
         $(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 1121 
Line 1298 
 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 1132 
Line 1310 
         @ $(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 1162 
Line 1344 
         $(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 1219 
Line 1417 
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test/static -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test/static -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/SampleProvider -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/SampleProvider -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/test/A -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/MCCAtest/A -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/test/B -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/MCCAtest/B -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test/TestProvider -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test/TestProvider -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1 -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1 -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test2 -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test2 -R -W
Line 1233 
Line 1431 
         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 -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 -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1/test2/test3/test4/test5/test6 -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 1242 
Line 1443 
         $(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
   
   ###############################################################################
   ##
   ## option_summary - used to generate a concise list of build options for use in
   ## a nightly build status report.  This is not intended to be a complete list,
   ## so it is likely that some options are omitted.  New options may be added
   ## here as needs dictate.
   ##
   ###############################################################################
   
   OPTION_SUMMARY =
   ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER),true)
       OPTION_SUMMARY += "+CMPI"
   endif
   ifeq ($(PEGASUS_ENABLE_CQL),true)
       OPTION_SUMMARY += "+CQL"
   endif
   ifeq ($(PEGASUS_HAS_ICU),true)
       OPTION_SUMMARY += "+ICU"
   endif
   ifeq ($(PEGASUS_ENABLE_IPV6),true)
       OPTION_SUMMARY += "+IPv6"
   endif
   ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER),true)
       OPTION_SUMMARY += "+JMPI"
   endif
   ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
       OPTION_SUMMARY += "+PrivSep"
   endif
   ifdef PEGASUS_ENABLE_EXECQUERY
       OPTION_SUMMARY += "+Query"
   endif
   ifdef PEGASUS_ENABLE_REMOTE_CMPI
       OPTION_SUMMARY += "+RCMPI"
   endif
   ifeq ($(PEGASUS_ENABLE_SLP),true)
       OPTION_SUMMARY += "+SLP"
   endif
   ifeq ($(PEGASUS_USE_SQLITE_REPOSITORY),true)
       OPTION_SUMMARY += "+SQLite"
   endif
   ifdef PEGASUS_HAS_SSL
       OPTION_SUMMARY += "+SSL"
   endif
   ifeq ($(PEGASUS_ENABLE_PROTOCOL_WSMAN),true)
       OPTION_SUMMARY += "+WSMan"
   endif
   
   option_summary:
           @$(ECHO) "$(OPTION_SUMMARY)"

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