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

Diff for /pegasus/TestMakefile between version 1.106.2.4 and 1.117

version 1.106.2.4, 2013/11/05 19:36:41 version 1.117, 2014/11/03 16:40:06
Line 313 
Line 313 
         $(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         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_Cimserver_Availability
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_sslCipherSuiteTests         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_sslCipherSuiteTests
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_TLSv1_2_tests
 ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER),true) ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER),true)
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_Cmpi_Sub         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_Cmpi_Sub
 endif endif
Line 383 
Line 384 
 ## ##
 ############################################################################### ###############################################################################
 ifeq ($(PEGASUS_DEFAULT_ENABLE_OOP),true) ifeq ($(PEGASUS_DEFAULT_ENABLE_OOP),true)
 OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false traceLevel=5 traceComponents=all  OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false
 else else
 OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true traceLevel=5 traceComponents=all  OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true
 endif endif
  
 ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true) ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
Line 394 
Line 395 
     # providers that register with UserContext = 5 (CIM Server).  The only     # providers that register with UserContext = 5 (CIM Server).  The only
     # case of this in the automated tests is the UserContextTestProvider.     # case of this in the automated tests is the UserContextTestProvider.
     OOP_TS1_TEST_CMDS = \     OOP_TS1_TEST_CMDS = \
         $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Pegasus/Client/tests/pullop@@poststarttests          $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/UserContextTestProvider/testclient@@poststarttests
 else else
     OOP_TS1_TEST_CMDS = \     OOP_TS1_TEST_CMDS = \
         $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Pegasus/Client/tests/pullop@@-f@@Makefile@@poststarttests          $(MAKE)@@--directory=$(PEGASUS_ROOT)@@-f@@Makefile@@poststarttests
 endif endif
  
 run_OOP_TS1: run_OOP_TS1:
Line 826 
Line 827 
 ############################################################################### ###############################################################################
  
  
   ###############################################################################
   ##  TLS v 1.2 support test as per NIST 800-131a
   ##
   ##  Configuration Options: enableHttpsConnection=true sslCipherSuite = TLSv1.2
   ##
   ###############################################################################
   TLS_1_2_SUPPORT_CONFIG = enableHttpsConnection=true sslCipherSuite=TLSv1.2
   TLSv1_2_support_tests = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Pegasus/Server/tests/TLSv_1_2_Support@@-f@@Makefile@@test_TLSv1_2
   
   ifdef PEGASUS_HAS_SSL
   run_TLSv1_2_tests:
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(TLS_1_2_SUPPORT_CONFIG)" \
               TESTSUITE_CMDS="$(TLSv1_2_support_tests)"
   else
   run_TLSv1_2_tests: FORCE
           @ $(ECHO) "+++++ PEGASUS_HAS_SSL not defined: Skipping TLSv 1.2 support tests"
   endif
   
   ###############################################################################
   
  
 ############################################################################### ###############################################################################
 ##  idleConnectionTimeout Test Suite 1:  uses ChunkingStressProvider Tests ##  idleConnectionTimeout Test Suite 1:  uses ChunkingStressProvider Tests
Line 1005 
Line 1028 
  
  
  
 LISTENING_ADD = $(shell TestListenAddress getSystemInterface)  #Hardcoding the addess 127.0.0.1,
 RESTRICT_INTRFC_TEST_CONFIG_OPTIONS= enableHttpConnection=true enableHttpsConnection=true listenAddress=$(LISTENING_ADD)  RESTRICT_INTRFC_TEST_CONFIG_OPTIONS= enableHttpConnection=true enableHttpsConnection=true listenAddress=127.0.0.1
 RESTRICT_INTRFC_TEST_CMDS=$(MAKE)@@--directory $(PEGASUS_ROOT)/src/Pegasus/Server/tests/InterfaceRestriction@@-f@@Makefile@@RestrictionTest RESTRICT_INTRFC_TEST_CMDS=$(MAKE)@@--directory $(PEGASUS_ROOT)/src/Pegasus/Server/tests/InterfaceRestriction@@-f@@Makefile@@RestrictionTest
  
 ifneq ($(strip $(LISTENING_ADD)),)  
 run_interfaceRestrictionTest:FORCE run_interfaceRestrictionTest:FORCE
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(RESTRICT_INTRFC_TEST_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(RESTRICT_INTRFC_TEST_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(RESTRICT_INTRFC_TEST_CMDS)"             TESTSUITE_CMDS="$(RESTRICT_INTRFC_TEST_CMDS)"
 else  
 run_interfaceRestrictionTest:FORCE  
         @ $(ECHO) "+++++ No Network Interface Detected: Skipping Network Restriction Test+++++++"  
 endif  
  
  
 ############################################################################## ##############################################################################

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