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

Diff for /pegasus/TestMakefile between version 1.87.4.3 and 1.90

version 1.87.4.3, 2008/11/21 01:57:40 version 1.90, 2008/08/19 17:19:21
Line 174 
Line 174 
 repositoryServer: FORCE repositoryServer: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(SLEEP) 5         $(SLEEP) 5
         $(RMDIRHIER) $(REPOSITORY_ROOT)          $(RMREPOSITORY) $(REPOSITORY_ROOT)
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart
         $(SLEEP) 5         $(SLEEP) 5
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryServer         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryServer
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 1380 
Line 1376 
         $(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  


Legend:
Removed from v.1.87.4.3  
changed lines
  Added in v.1.90

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2