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

Diff for /pegasus/TestMakefile between version 1.106.2.5 and 1.118

version 1.106.2.5, 2013/11/05 19:38:50 version 1.118, 2015/01/15 19:57:57
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 324 
Line 325 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimListenAddress         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimListenAddress
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_interfaceRestrictionTest         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_interfaceRestrictionTest
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_providerReregisterTests         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_providerReregisterTests
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_ENUMCTXT_TS1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_ENUMCTXT_TS2
  
 ##################### #####################
 # #
Line 826 
Line 829 
 ############################################################################### ###############################################################################
  
  
   ###############################################################################
   ##  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 838 
Line 863 
         $(MAKE)@@--directory \         $(MAKE)@@--directory \
             $(PEGASUS_ROOT)/src/Providers/TestProviders/ChunkingStressProvider/testclient \             $(PEGASUS_ROOT)/src/Providers/TestProviders/ChunkingStressProvider/testclient \
             -f@@Makefile@@poststarttests             -f@@Makefile@@poststarttests
   
 run_idleConnectionTimeout1: FORCE run_idleConnectionTimeout1: FORCE
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(IDLE_CONNECTION_TIMEOUT_1_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(IDLE_CONNECTION_TIMEOUT_1_CONFIG_OPTIONS)" \
Line 921 
Line 947 
  
 ############################################################################## ##############################################################################
  
   ###############################################################################
   ##  EnumerationContext Black Box test 1
   ##
   ##  Configuration Options: Run with trace on and at least EnumContext compent
   ##                         set.  Trace output used to diagnose results
   ##                         Run with forceProviderProcesses=true
   ##  Runs a test of pull operations and tests the trace output to determine if
   ##  it includes an equal number of create and remove trace entries indicating
   ##  that all enumerations contexts completed. Note that today the code that
   ##  tests the trace results is a sh script and grep so this runs only on
   ##  systems that have these tools
   ##  This test was added in OpenPegasus 2.14 when the pull operations were
   ##  added
   ##
   ###############################################################################
   ENUMCTXT_TS1_CONFIG_OPTIONS = traceComponents=EnumContext traceLevel=4 forceProviderProcesses=true
   
   ENUMCTXT_TS1A_TEST_CMDS = \
           $(MAKE)@@--directory \
               $(PEGASUS_ROOT)/src/Pegasus/Client/tests/pullop -f@@Makefile poststarttests
   
   ENUMCTXT_TS1B_TEST_CMDS = \
           $(MAKE)@@--directory \
               $(PEGASUS_ROOT)/src/Pegasus/Client/tests/PullErrors -f@@Makefile poststarttests
   
   ENUMCTXT_POSTTEST_CMD = $(PEGASUS_ROOT)/src/Pegasus/Client/tests/pullop/testContextTraceOutput
   
   run_ENUMCTXT_TS1:
   ifeq ($(findstring LINUX_, $(PEGASUS_PLATFORM)), LINUX_)
           $(RM) $(PEGASUS_HOME)/trace/*
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(ENUMCTXT_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(ENUMCTXT_TS1A_TEST_CMDS)"
           $(ENUMCTXT_POSTTEST_CMDS)
   
           $(RM) $(PEGASUS_HOME)/trace/*
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(ENUMCTXT_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(ENUMCTXT_TS1B_TEST_CMDS)"
           $(ENUMCTXT_POSTTEST_CMD)
   else
           @ $(ECHO) "+++++ run_ENUMCTXT_TS1 runs only in certain environments"
   endif
   ###############################################################################
   
   ###############################################################################
   ##  EnumerationContext Black Box test 2
   ##  Parallel to ENUMCTXT_TS1 except with forceProviderProcesses=false
   ##
   ###############################################################################
   ENUMCTXT_TS2_CONFIG_OPTIONS = traceComponents=EnumContext traceLevel=4 forceProviderProcesses=false
   
   ## uses the test commands from run_ENUMCTXT_TS1
   
   run_ENUMCTXT_TS2:
   ifeq ($(findstring LINUX_, $(PEGASUS_PLATFORM)), LINUX_)
           $(RM) $(PEGASUS_HOME)/trace/*
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(ENUMCTXT_TS2_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(ENUMCTXT_TS1A_TEST_CMDS)"
           $(ENUMCTXT_POSTTEST_CMDS)
   
           $(RM) $(PEGASUS_HOME)/trace/*
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(ENUMCTXT_TS2_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(ENUMCTXT_TS1B_TEST_CMDS)"
           $(ENUMCTXT_POSTTEST_CMD)
   else
           @ $(ECHO) "+++++ run_ENUMCTXT_TS1 runs only in certain environments"
   endif
   ###############################################################################
  
 ############################################################################# #############################################################################
 ## ##
Line 1005 
Line 1102 
  
  
  
 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  
  
  
 ############################################################################## ##############################################################################
Line 1358 
Line 1450 
         $(USAGE)"Listener"         $(USAGE)"Listener"
         $(USAGE)"DiscardedData"         $(USAGE)"DiscardedData"
         $(USAGE)"ProviderAgent"         $(USAGE)"ProviderAgent"
           $(USAGE)"EnumContext"
         $(USAGE)         $(USAGE)
  
 ############################################################################### ###############################################################################

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