BUG#: 8815

[tpot/pegasus/.git] / TestMakefile

diff --git a/TestMakefile b/TestMakefile
index a341064b85c5cb3dd009ccdcd9248b8eeb6e71c2..d5ec9bafb9fb5178b734b4094a439ff900b27518 100644 (file)
--- a/TestMakefile
+++ b/TestMakefile
@@ -305,6 +305,7 @@ serversuite: FORCE
        $(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
+       $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_Cimserver_Availability
 ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER),true)
        $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_Cmpi_Sub
 endif
@@ -777,7 +778,6 @@ run_idleConnectionTimeout1: FORCE
             TESTSUITE_CMDS="$(IDLE_CONNECTION_TIMEOUT_1_TEST_CMDS)"
 ###############################################################################
 
-
 ###############################################################################
 ##  idleConnectionTimeout Test Suite 2:  uses IdleConnectionTimeout client test
 ##
@@ -795,6 +795,22 @@ run_idleConnectionTimeout2: FORCE
             TESTSUITE_CMDS="$(IDLE_CONNECTION_TIMEOUT_2_TEST_CMDS)"
 ###############################################################################
 
+###############################################################################
+##  cimserver thread limit test:
+##
+##  Configuration Options: none
+##
+###############################################################################
+CIMSERVER_THREAD_LIMIT_TEST_CONFIG_OPTIONS = forceProviderProcesses=true
+CIMSERVER_THREAD_LIMIT_TEST_CMDS = \
+       $(MAKE)@@--directory \
+            $(PEGASUS_ROOT)/src/Providers/TestProviders/FaultyInstanceProvider/testclient \
+            -f@@Makefile@@runAvailabilityTest
+run_Cimserver_Availability: FORCE
+       $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
+            CIMSERVER_CONFIG_OPTIONS="$(CIMSERVER_THREAD_LIMIT_TEST_CONFIG_OPTIONS)" \
+            TESTSUITE_CMDS="$(CIMSERVER_THREAD_LIMIT_TEST_CMDS)"
+###############################################################################
 
 ###############################################################################
 ##  cimsub CLI Test Suite 1:  PG_InterOp Tests
@@ -1454,3 +1470,53 @@ check_for_cores:
             generate_core_file_list
        @$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
             check_core_search_results
+
+###############################################################################
+##
+## option_summary - used to generate a concise list of build options for use in
+## a nightly build status report.  This is not intended to be a complete list,
+## so it is likely that some options are omitted.  New options may be added
+## here as needs dictate.
+##
+###############################################################################
+
+OPTION_SUMMARY =
+ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER),true)
+    OPTION_SUMMARY += "+CMPI"
+endif
+ifeq ($(PEGASUS_ENABLE_CQL),true)
+    OPTION_SUMMARY += "+CQL"
+endif
+ifeq ($(PEGASUS_HAS_ICU),true)
+    OPTION_SUMMARY += "+ICU"
+endif
+ifeq ($(PEGASUS_ENABLE_IPV6),true)
+    OPTION_SUMMARY += "+IPv6"
+endif
+ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER),true)
+    OPTION_SUMMARY += "+JMPI"
+endif
+ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
+    OPTION_SUMMARY += "+PrivSep"
+endif
+ifdef PEGASUS_ENABLE_EXECQUERY
+    OPTION_SUMMARY += "+Query"
+endif
+ifdef PEGASUS_ENABLE_REMOTE_CMPI
+    OPTION_SUMMARY += "+RCMPI"
+endif
+ifeq ($(PEGASUS_ENABLE_SLP),true)
+    OPTION_SUMMARY += "+SLP"
+endif
+ifeq ($(PEGASUS_USE_SQLITE_REPOSITORY),true)
+    OPTION_SUMMARY += "+SQLite"
+endif
+ifdef PEGASUS_HAS_SSL
+    OPTION_SUMMARY += "+SSL"
+endif
+ifeq ($(PEGASUS_ENABLE_PROTOCOL_WSMAN),true)
+    OPTION_SUMMARY += "+WSMan"
+endif
+
+option_summary:
+       @$(ECHO) "$(OPTION_SUMMARY)"