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

Diff for /pegasus/TestMakefile between version 1.87.4.3 and 1.98

version 1.87.4.3, 2008/11/21 01:57:40 version 1.98, 2008/11/21 22:04:25
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 276 
Line 276 
 ifeq ($(PEGASUS_TEST_SDK),true) ifeq ($(PEGASUS_TEST_SDK),true)
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/SDK/samples -f Makefile setupSDK         $(MAKE) --directory=$(PEGASUS_ROOT)/src/SDK/samples -f Makefile setupSDK
 endif endif
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstop
  
 # slptests are run under separate target because these testcases require that # slptests are run under separate target because these testcases require that
 # both the cimserver and SLP are running. There is no need for special options # both the cimserver and SLP are running. There is no need for special options
Line 288 
Line 289 
         @ $(ECHO) "+++++ TestMakefile servertests suites complete"         @ $(ECHO) "+++++ TestMakefile servertests suites complete"
  
 serversuite: FORCE serversuite: FORCE
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Server/tests -f Makefile commandtests
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinRepository         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinRepository
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_Cimsub_InterOp         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_Cimsub_InterOp
Line 373 
Line 376 
 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 = \ OOP_TS1_TEST_CMDS = \
         $(MAKE)@@--directory=$(PEGASUS_ROOT)@@Makefile@@-s@@poststarttests          $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/UserContextTestProvider/testclient@@poststarttests
   else
       OOP_TS1_TEST_CMDS = \
           $(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 559 
 ##         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 594 
 ##         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 1176 
         $(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 1265 
 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 1311 
         $(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

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