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

Diff for /pegasus/TestMakefile between version 1.75.2.1 and 1.75.2.2

version 1.75.2.1, 2006/10/16 15:09:52 version 1.75.2.2, 2006/10/17 10:42:33
Line 232 
Line 232 
 # unittests # unittests
 # #
 unittests: FORCE unittests: FORCE
 ifdef PEGASUS_ENABLE_REMOTE_CMPI  
         $(CMPIR_STOP_DAEMON)  
 endif  
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile tests         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile tests
         @ $(ECHO) "+++++ TestMakefile unittests complete"         @ $(ECHO) "+++++ TestMakefile unittests complete"
  
Line 270 
Line 267 
         $(SLEEP) 5         $(SLEEP) 5
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile ConfigureUsers         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile ConfigureUsers
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile Create_SSL_Certificate         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile Create_SSL_Certificate
   ifeq ($(PEGASUS_TEST_SDK),true)
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/SDK/samples -f Makefile setupSDK
   endif
   
  
  
 servertests: servertestsclean servertestssetup serversuite servertests: servertestsclean servertestssetup serversuite
         @ $(ECHO) "+++++ TestMakefile servertests suites complete"         @ $(ECHO) "+++++ TestMakefile servertests suites complete"
  
 serversuite: FORCE serversuite: FORCE
 ifdef PEGASUS_ENABLE_REMOTE_CMPI  
         $(CMPIR_START_DAEMON)  
 endif  
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinRepository         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinRepository
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOP_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOP_TS1
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_IndInit_TS1         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_IndInit_TS1
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOPProvFail_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_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_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_ExportClientSSL_TS1
  
 ##################### #####################
 # #
Line 461 
Line 462 
 endif 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 584 
Line 617 
             TESTSUITE_CMDS="$(STRESS_TS1_TEST_CMDS)"             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
  
 ############################################################################### ###############################################################################
  

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