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

Diff for /pegasus/TestMakefile between version 1.89 and 1.89.14.3

version 1.89, 2007/11/28 20:41:05 version 1.89.14.3, 2009/01/06 18:43:06
Line 1263 
Line 1263 
         @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthentication, TestLocalSecurity, and TestRemoteSecurity "         @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthentication, TestLocalSecurity, and TestRemoteSecurity "
         @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthorization and TestAuthorization "         @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthorization and TestAuthorization "
 endif endif
           # Reset the security options to the defaults
           cimconfig -u enableNamespaceAuthorization -p
           cimconfig -u enableAuthentication -p
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         @ $(ECHO) "+++++ TestMakefile standardtests complete"         @ $(ECHO) "+++++ TestMakefile standardtests complete"
  
 TestNoSecurity: TestNoSecurity:
Line 1376 
Line 1380 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="enableHttpConnection=false enableHttpsConnection=true"         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="enableHttpConnection=false enableHttpsConnection=true"
         $(SLEEP) 5         $(SLEEP) 5
  
   ###############################################################################
   ##
   ## check_for_cores - used to search for core files in the build environment.
   ##
   ## This option will search (1) each source directory, (2) the PEGASUS_CORE_DIR
   ## if it is defined and (3) the PEGASUS_TMP directory.
   ##
   ###############################################################################
   CORE_FILE_LIST = $(PEGASUS_HOME)/CoreFileList
   
   check_core_search_results:
   ifneq ($(wildcard $(CORE_FILE_LIST)), )
           @$(ECHO) "*** One or more core files found. ***"
           @$(CAT) $(CORE_FILE_LIST)
           @exit 1
   endif
   
   ifdef PEGASUS_CORE_DIR
      CORE_FILES_IN_CORE_DIR = \
          $(wildcard $(PEGASUS_CORE_DIR)/$(PLATFORM_CORE_PATTERN))
   endif
   ifdef PEGASUS_TMP
      CORE_FILES_IN_TMP_DIR = \
          $(wildcard $(PEGASUS_TMP)/$(PLATFORM_CORE_PATTERN))
   endif
   
   generate_core_file_list:
           @$(RM) $(CORE_FILE_LIST)
           @$(MAKE) -s directory=$(PEGASUS_ROOT) general OPTION=CORE_SEARCH \
               CORE_FILE_LIST=$(CORE_FILE_LIST)
   ifdef PEGASUS_CORE_DIR
      ifneq ($(CORE_FILES_IN_CORE_DIR), )
           @$(ECHO) $(CORE_FILES_IN_CORE_DIR) >> $(CORE_FILE_LIST)
      endif
   endif
   ifdef PEGASUS_TMP
      ifneq ($(CORE_FILES_IN_TMP_DIR), )
           @$(ECHO) $(CORE_FILES_IN_TMP_DIR) >> $(CORE_FILE_LIST)
      endif
   endif
   
   check_for_cores:
           @$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
               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
   ifdef PEGASUS_HAS_SSL
       OPTION_SUMMARY += "+SSL"
   endif
   ifeq ($(PEGASUS_ENABLE_PROTOCOL_WSMAN),true)
       OPTION_SUMMARY += "+WSMan"
   endif
   
   option_summary:
           @$(ECHO) "$(OPTION_SUMMARY)"


Legend:
Removed from v.1.89  
changed lines
  Added in v.1.89.14.3

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2