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

Diff for /pegasus/TestMakefile between version 1.106.2.2 and 1.106.2.4

version 1.106.2.2, 2013/06/03 22:34:01 version 1.106.2.4, 2013/11/05 19:36:41
Line 291 
Line 291 
  
 serversuite: FORCE serversuite: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Server/tests -f Makefile commandtests         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Server/tests -f Makefile commandtests
   ifeq ($(PEGASUS_ENABLE_SLP),true)
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/slp/tests/srv_reg/ -f Makefile tests
   endif
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart         $(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
Line 380 
Line 383 
 ## ##
 ############################################################################### ###############################################################################
 ifeq ($(PEGASUS_DEFAULT_ENABLE_OOP),true) ifeq ($(PEGASUS_DEFAULT_ENABLE_OOP),true)
 OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false  OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false traceLevel=5 traceComponents=all
 else else
 OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true  OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true traceLevel=5 traceComponents=all
 endif endif
  
 ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true) ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
Line 391 
Line 394 
     # providers that register with UserContext = 5 (CIM Server).  The only     # providers that register with UserContext = 5 (CIM Server).  The only
     # case of this in the automated tests is the UserContextTestProvider.     # case of this in the automated tests is the UserContextTestProvider.
     OOP_TS1_TEST_CMDS = \     OOP_TS1_TEST_CMDS = \
         $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/UserContextTestProvider/testclient@@poststarttests          $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Pegasus/Client/tests/pullop@@poststarttests
 else else
     OOP_TS1_TEST_CMDS = \     OOP_TS1_TEST_CMDS = \
         $(MAKE)@@--directory=$(PEGASUS_ROOT)@@-f@@Makefile@@poststarttests          $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Pegasus/Client/tests/pullop@@-f@@Makefile@@poststarttests
 endif endif
  
 run_OOP_TS1: run_OOP_TS1:


Legend:
Removed from v.1.106.2.2  
changed lines
  Added in v.1.106.2.4

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2