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

Diff for /pegasus/TestMakefile between version 1.115 and 1.116

version 1.115, 2013/06/18 05:41:24 version 1.116, 2014/07/15 18:43:39
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 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


Legend:
Removed from v.1.115  
changed lines
  Added in v.1.116

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2