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

Diff for /pegasus/TestMakefile between version 1.87.4.4 and 1.96

version 1.87.4.4, 2009/01/06 18:43:54 version 1.96, 2008/11/17 19:31:23
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 373 
Line 373 
 OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true
 endif endif
  
   ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
       # When privilege separation is enabled, most providers run out of process
       # regardless of the forceProviderProcesses setting.  The exception is
       # providers that register with UserContext = 5 (CIM Server).  The only
       # case of this in the automated tests is the UserContextTestProvider.
       OOP_TS1_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/UserContextTestProvider/testclient@@poststarttests
   else
 OOP_TS1_TEST_CMDS = \ OOP_TS1_TEST_CMDS = \
         $(MAKE)@@--directory=$(PEGASUS_ROOT)@@Makefile@@-s@@poststarttests          $(MAKE)@@--directory=$(PEGASUS_ROOT)@@-f@@Makefile@@poststarttests
   endif
  
 run_OOP_TS1: run_OOP_TS1:
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
Line 547 
Line 556 
 ##         we are providing a dummy password. ##         we are providing a dummy password.
 ## ##
 ############################################################################### ###############################################################################
 SSL_IPV4_TS1_CONFIG_OPTIONS = enableHttpsConnection=true  SSL_IPV4_TS1_CONFIG_OPTIONS = enableHttpsConnection=true \
         enableAuthentication=false
 SSL_IPV4_TS1_CMD_1 = \ SSL_IPV4_TS1_CMD_1 = \
         osinfo -s -w notapassword -h 127.0.0.1 -p 5989         osinfo -s -w notapassword -h 127.0.0.1 -p 5989
 SSL_IPV4_TS1_CMD_2 = \ SSL_IPV4_TS1_CMD_2 = \
Line 581 
Line 591 
 ##         on certain versions. ##         on certain versions.
 ## ##
 ############################################################################### ###############################################################################
 SSL_IPV6_TS1_CONFIG_OPTIONS = enableHttpsConnection=true  SSL_IPV6_TS1_CONFIG_OPTIONS = enableHttpsConnection=true \
         enableAuthentication=false
 SSL_IPV6_TS1_CMD_1 = \ SSL_IPV6_TS1_CMD_1 = \
         osinfo -s -w notapassword -h ::1 -p 5989         osinfo -s -w notapassword -h ::1 -p 5989
 SSL_IPV6_TS1_CMD_2 = \ SSL_IPV6_TS1_CMD_2 = \
Line 1162 
Line 1173 
         $(USAGE)"ControlProvider"         $(USAGE)"ControlProvider"
         $(USAGE)"AsyncOpNode"         $(USAGE)"AsyncOpNode"
         $(USAGE)"CIMOMHandle"         $(USAGE)"CIMOMHandle"
         $(USAGE)"BinaryMessageHandler"  
         $(USAGE)"L10N"         $(USAGE)"L10N"
         $(USAGE)"ExportClient"         $(USAGE)"ExportClient"
         $(USAGE)"Listener"         $(USAGE)"Listener"
Line 1252 
Line 1262 
 standardtests: FORCE standardtests: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i DisableSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i DisableSecurity
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestCimmof         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestCimmof
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestNoSecurity  #       $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestNoSecurity
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository testrepository
 ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthentication         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthentication
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestLocalSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestLocalSecurity
Line 1297 
Line 1308 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstop
  
 TestCimmof: TestCimmof:
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Testcimmof poststarttests          # Build the repository with cimmofl and cimmof and compare them.
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
           -@$(MOVE) $(REPOSITORY_DIR)/repository $(REPOSITORY_DIR)/repository-save
           @$(RMREPOSITORY) $(REPOSITORY_DIR)/repository-cimmofl
           @$(RMREPOSITORY) $(REPOSITORY_DIR)/repository-cimmof
           @$(ECHO) $(CIM_SCHEMA_DIR)
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository
           @$(MOVE) $(REPOSITORY_DIR)/repository $(REPOSITORY_DIR)/repository-cimmofl
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart
           @$(ECHO) $(CIM_SCHEMA_DIR)
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryServer
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstop
           @$(MOVE) $(REPOSITORY_DIR)/repository $(REPOSITORY_DIR)/repository-cimmof
           -@$(MOVE) $(REPOSITORY_DIR)/repository-save $(REPOSITORY_DIR)/repository
           TestCompareRepositories $(REPOSITORY_DIR)/repository-cimmofl $(REPOSITORY_DIR)/repository-cimmof
           @$(RMREPOSITORY) $(REPOSITORY_DIR)/repository-cimmofl
           @$(RMREPOSITORY) $(REPOSITORY_DIR)/repository-cimmof
  
 RunTestClientLocal: RunTestClientLocal:
         TestClient -local         TestClient -local
Line 1380 
Line 1407 
         $(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  
 ifndef PEGASUS_DISABLE_CQL  
     OPTION_SUMMARY += "+CQL"  
 endif  
 ifdef PEGASUS_HAS_MESSAGES  
     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  
   
 option_summary:  
         @$(ECHO) "$(OPTION_SUMMARY)"  

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