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

Diff for /pegasus/TestMakefile between version 1.43 and 1.62.2.4

version 1.43, 2005/11/06 18:20:43 version 1.62.2.4, 2007/12/14 20:56:53
Line 1 
Line 1 
 #//%2005////////////////////////////////////////////////////////////////////////  #//%2006////////////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 #// EMC Corporation; VERITAS Software Corporation; The Open Group. #// EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; Symantec Corporation; The Open Group.
 #// #//
 #// Permission is hereby granted, free of charge, to any person obtaining a copy #// Permission is hereby granted, free of charge, to any person obtaining a copy
 #// of this software and associated documentation files (the "Software"), to #// of this software and associated documentation files (the "Software"), to
Line 62 
Line 64 
         $(USAGE)"standardtests      - Execute an extended server test suites "         $(USAGE)"standardtests      - Execute an extended server test suites "
         $(USAGE)"                     using multiple options."         $(USAGE)"                     using multiple options."
         $(USAGE)"serverquicktests   - Executes a brief server test"         $(USAGE)"serverquicktests   - Executes a brief server test"
           $(USAGE)"perftests          - Executes a brief server performance test"
         $(USAGE)         $(USAGE)
         $(USAGE)"usage2             - usage on secondary test targets"         $(USAGE)"usage2             - usage on secondary test targets"
         $(USAGE)"usagetrace         - usage on trace targets"         $(USAGE)"usagetrace         - usage on trace targets"
Line 91 
Line 94 
         $(USAGE)         $(USAGE)
         $(USAGE)"run_SSL_TS1             - Executes the SSL tests"         $(USAGE)"run_SSL_TS1             - Executes the SSL tests"
         $(USAGE)"run_OOP_TS1             - Executes the Out Of Process Provider tests"         $(USAGE)"run_OOP_TS1             - Executes the Out Of Process Provider tests"
           $(USAGE)"run_G11N_TS1            - Executes the Globalization tests"
         $(USAGE)         $(USAGE)
         $(USAGE)"The following require the repository to be pre-built and the server to be started."         $(USAGE)"The following require the repository to be pre-built and the server to be started."
         $(USAGE)         $(USAGE)
Line 226 
Line 230 
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Query/QueryExpression/tests/Queries -f Makefile clean         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Query/QueryExpression/tests/Queries -f Makefile clean
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile clean         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile clean
  
   
 servertestssetup: FORCE servertestssetup: FORCE
   ifdef PEGASUS_HAS_SSL
   #
   # The association between user names and certificates is stored in the
   # repository.  If the repository is recreated, we also need to re-initialize
   # the trust store directories. Otherwise, the truststore content will be
   # out-of-sync with the mapping stored in the repository.
   #
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile removeSSLTrustDirectories
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile createSSLTrustDirectories
   endif
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart
         $(SLEEP) 5         $(SLEEP) 5
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile ConfigureUsers
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile Create_SSL_Certificate
   
  
 servertests: servertestsclean servertestssetup serversuite servertests: servertestsclean servertestssetup serversuite
         @ $(ECHO) "+++++ TestMakefile servertests suites complete"         @ $(ECHO) "+++++ TestMakefile servertests suites complete"
Line 241 
Line 257 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinRepository         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinRepository
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOP_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOP_TS1
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_IndInit_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_IndInit_TS1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_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_SSL_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_SSL_TS1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_G11N_TS1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_idleConnectionTimeout1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_idleConnectionTimeout2
  
 #################### ####################
 # #
Line 251 
Line 274 
         @ $(ECHO) "+++++ TestMakefile serverquicktests complete"         @ $(ECHO) "+++++ TestMakefile serverquicktests complete"
  
 serverquicksuite: FORCE serverquicksuite: FORCE
         $(PEGASUS_HOME)/bin/TestClient  
         $(PEGASUS_HOME)/bin/Client         $(PEGASUS_HOME)/bin/Client
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile poststarttests         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile poststarttests
           $(PEGASUS_HOME)/bin/TestClient
   
   ####################
   #
   # perftests - simple performance test until we have better
   #
   # - Turns statistics on (uses TestInterop until we have better)
   # - runs and times serverquicktests suite
   # - runs cimperf to displat the statistics
   # - turns statistics off
   #
   perftests: servertestsclean servertestssetup perfsuite
   
   perfsuite: FORCE
           $(PEGASUS_HOME)/bin/TestInterop on
           $(TIME_CMD) $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile poststarttests
           @ $(ECHO) " "
           $(TIME_CMD) $(PEGASUS_HOME)/bin/TestClient
           @ $(ECHO) " "
           $(TIME_CMD) $(PEGASUS_HOME)/bin/benchmarkTest
           @ $(ECHO) " "
           @ $(ECHO) " "
           $(TIME_CMD) $(PEGASUS_HOME)/bin/cimperf
           @ $(ECHO) " "
           $(PEGASUS_HOME)/bin/TestInterop off
   
  
 #################### ####################
 # #
Line 275 
Line 323 
 ## ##
 ##  Configuration Options: forceProviderProcesses=true ##  Configuration Options: forceProviderProcesses=true
 ## ##
   ##  If PEGASUS_DEFAULT_ENABLE_OOP is set, then tests are run with OOP disabled
   ##  since tests have already been run with OOP enabled.
   ##
   ##
 ############################################################################### ###############################################################################
   ifeq ($(PEGASUS_DEFAULT_ENABLE_OOP),true)
   OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false
   else
 OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true
   endif
   
 OOP_TS1_TEST_CMDS = \ OOP_TS1_TEST_CMDS = \
         TestClient          $(MAKE)@@--directory=$(PEGASUS_ROOT)@@Makefile@@-s@@poststarttests
  
 run_OOP_TS1: run_OOP_TS1:
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(OOP_TS1_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(OOP_TS1_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(OOP_TS1_TEST_CMDS)"             TESTSUITE_CMDS="$(OOP_TS1_TEST_CMDS)"
   
 ############################################################################### ###############################################################################
  
 ############################################################################### ###############################################################################
Line 307 
Line 365 
             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
   ##
   ##  Configuration Options: (none)
   ##
   ###############################################################################
   INDSSL_TS1a_CONFIG_OPTIONS = enableHttpsConnection=true enableAuthentication=false
   INDSSL_TS1a_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/IndicationStressTestProvider/testclient@@-f@@Makefile@@run_TS1_AuthenticationDisabled
   
   INDSSL_TS1b_CONFIG_OPTIONS = enableHttpsConnection=true enableAuthentication=true sslClientVerificationMode=required
   INDSSL_TS1b_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/IndicationStressTestProvider/testclient@@-f@@Makefile@@run_TS1_AuthenticationEnabled
   
   
   ifdef PEGASUS_HAS_SSL
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
   run_INDSSL_TS1: EnableUsers Create_SSL_Certificate_ignore
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1a_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(INDSSL_TS1a_TEST_CMDS)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1b_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(INDSSL_TS1b_TEST_CMDS)"
   else
   run_INDSSL_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_INDSSL_TS1"
   endif
   else
   run_INDSSL_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_HAS_SSL not defined: Skipping run_INDSSL_TS1"
   endif
   
   
   ###############################################################################
   
   ###############################################################################
 ##  SSL Test Suite 1: SSL Tests ##  SSL Test Suite 1: SSL Tests
 ## ##
 ##  Configuration Options: enableAuthentication=true ##  Configuration Options: enableAuthentication=true
Line 321 
Line 512 
        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/tests@@SSLCertificateTest1        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/tests@@SSLCertificateTest1
  
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
 run_SSL_TS1: FORCE run_SSL_TS1: FORCE
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(SSL_TS1_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(SSL_TS1_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(SSL_TS1_TEST_CMDS)"             TESTSUITE_CMDS="$(SSL_TS1_TEST_CMDS)"
 else else
 run_SSL_TS1: FORCE run_SSL_TS1: FORCE
         @ $(ECHO) "PEGASUS_HAS_SSL not defined: Skipping run_SSL_TS1 poststarttest"          @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_SSL_TS1"
   endif
   else
   run_SSL_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_HAS_SSL not defined: Skipping run_SSL_TS1 poststarttest"
  
 endif endif
  
   ############################################################################
   #
   # Create_SSL_Certificate
   #
   # create a certificate that can be used for certification testing.
   # It is currently used by the following tests:
   #            -run_INDSSL_TS1
   #
   Create_SSL_Certificate_ignore: FORCE
           -$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile Create_SSL_Certificate
   
   Create_SSL_Certificate: FORCE
   ifdef PEGASUS_HAS_SSL
   ifdef PEGASUS_TEST_USER_DEFINED
           $(ECHO) "Creating SSL certificate for test"
           ssltrustmgr -a -c $(PEGASUS_TEST_USER_ID) -f $(PEGASUS_HOME)/server.pem
   endif
   else
           $(ECHO) "PEGASUS_HAS_SSL not defined - Not Creating SSL certificate for test"
   endif
   
   ###############################################################################
   ##  G11N Test Suite 1: Globalization Tests
   ##
   ##  Configuration Options: forceProviderProcesses=false
   ##
   ###############################################################################
   G11N_TS1_CONFIG_OPTIONS = forceProviderProcesses=false
   G11N_TS1_TEST_CMDS = \
           $(MAKE) --directory $(PEGASUS_ROOT)/src/Clients/g11ntest \
               -f Makefile g11ntest
   
   run_G11N_TS1:
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(G11N_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(G11N_TS1_TEST_CMDS)"
   ###############################################################################
   
   
   ###############################################################################
   ##  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)"
   ###############################################################################
   
  
 ############################################################################### ###############################################################################
  
Line 575 
Line 845 
  
 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 707 
Line 987 
  
 list: tracesettings list: tracesettings
  
   #########################################################################
 # More options...  # standardtests
   #
   # More testing options...
   #
   # The standard test seem to contain additional test that may not be able
   # to run on all platforms so they have been grouped here for now rather than
   # being included in the serversuite rule.
   #
   # The test are:
   #      TestCimmof
   #      TestNoSecurity
   #      TestLocalSecurity
   #      TestRemoteSecurity
   #      TestAuthorization
   #
   # NOTE: The TestsNoSecurity test is comprised of DisableSecurity and
   #       TestNoSecurity.
   #
   # NOTE: The TestNoSecurity step runs the servertests which builds the
   #       the repository that is then left in place for the remaining tests.
   #       The cimof test must be before the TestNosecurity step as it removes
   #       the repository builds a new one with cimmofl and another one with
   #       cimmof and then compares them.
   #
   # NOTE: The Authentication test is comprised of EnableAuthentication,
   #       TestLocalSecurity and TestRemoteSecurity.
   #
   # NOTE: The Authorization test is comprised of EnableAuthorization and
   #       TestAuthorization.
   #
   # NOTE: The EnableAuthentication and EnableAuthorization steps require
   #       root access. Pegasus doesn't currently have the infrastructure
   #       in place to run the server as root and run the test as non-root.
   #       Rather than run everything, server, tests, providers, clients etc.
   #       as root many testers prefer to run the tests as non-root. Setting
   #       PEGASUS_DISABLE_PRIVILEGED_TESTS in the environment helps to
   #       facilitate that.
   #
  
 standardtests: 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
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthentication         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthentication
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestLocalSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestLocalSecurity
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestRemoteSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestRemoteSecurity
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthorization         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthorization
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestAuthorization         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestAuthorization
   else
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthentication, TestLocalSecurity, and TestRemoteSecurity "
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthorization and TestAuthorization "
   endif
         @ $(ECHO) "+++++ TestMakefile standardtests complete"         @ $(ECHO) "+++++ TestMakefile standardtests complete"
  
 TestNoSecurity: TestNoSecurity:
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile tests          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile servertests
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithoutSSL         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithoutSSL
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile RunTestClientLocal         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile RunTestClientLocal
  
Line 731 
Line 1053 
         $(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 759 
Line 1081 
         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 775 
Line 1102 
         $(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 test1 -R -W
         cimauth -a -u guest -n test2 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test2 -R -W
         cimauth -a -u guest -n test3 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test3 -R -W
         cimauth -a -u guest -n test4 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test4 -R -W
         cimauth -a -u guest -n test5 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test5 -R -W
         cimauth -a -u guest -n test6 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test6 -R -W
         cimauth -a -u guest -n test1/test2 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1/test2 -R -W
         cimauth -a -u guest -n test1/test2/test3 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1/test2/test3 -R -W
         cimauth -a -u guest -n test1/test2/test3/test4 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1/test2/test3/test4 -R -W
         cimauth -a -u guest -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 guest -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
  
 startcimWithoutSSL: FORCE startcimWithoutSSL: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart

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