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

Diff for /pegasus/TestMakefile between version 1.7.2.1 and 1.11.2.1

version 1.7.2.1, 2003/08/13 19:39:49 version 1.11.2.1, 2004/04/02 21:20:43
Line 32 
Line 32 
   SLEEP =   SLEEP =
   REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus   REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus
   MUEXE = mu.exe   MUEXE = mu.exe
   COPYMU = copy src\utils\mu\$(MUEXE) /y $(MUEXE)    MKDIR = $(MUEXE) mkdirhier
   MKDIR = src/utils/mu/mu mkdirhier  
   TESTS = prestarttests poststarttests   TESTS = prestarttests poststarttests
 endif endif
  
Line 42 
Line 41 
   CIMSERVER_STOP_SERVICE = cimserver -s; true   CIMSERVER_STOP_SERVICE = cimserver -s; true
   SLEEP = sleep 5   SLEEP = sleep 5
   MUEXE = mu   MUEXE = mu
   COPYMU = cp -f src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)    MKDIR = $(MUEXE) mkdirhier
   MKDIR = src/utils/mu/mu mkdirhier  
   TESTS = prestarttests poststarttests   TESTS = prestarttests poststarttests
 endif endif
  
 ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
   CIMSERVER_START_SERVICE = cimserver   CIMSERVER_START_SERVICE = cimserver
   CIMSERVER_STOP_SERVICE = ps -ef | grep cimserver | grep -v grep | awk '{print "kill -9 "$$2 |"/bin/bash"}'    CIMSERVER_STOP_SERVICE = cimserver -s; true
   SLEEP = sleep 5   SLEEP = sleep 5
   MUEXE = mu   MUEXE = mu
   COPYMU = cp -f src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)    MKDIR = $(MUEXE) mkdirhier
   MKDIR = src/utils/mu/mu mkdirhier  
   TESTS = prestarttests poststarttests   TESTS = prestarttests poststarttests
 endif endif
  
Line 63 
Line 60 
 buildmu: buildmu:
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile
         $(MKDIR) $(BIN_DIR)         $(MKDIR) $(BIN_DIR)
         $(COPYMU)  
  
 rebuild: clean buildmu all rebuild: clean buildmu all
  
Line 217 
Line 213 
  
 EnableAuthorization: EnableAuthorization:
         $(MAKE) -f TestMakefile -i stopcim         $(MAKE) -f TestMakefile -i stopcim
         cimconfig -s enableAuthorization=true -p          cimconfig -s enableNamespaceAuthorization=true -p
         $(MAKE) -f TestMakefile startcimWithoutSSL         $(MAKE) -f TestMakefile startcimWithoutSSL
         $(MAKE) -f TestMakefile -i ConfigureAuthorizations         $(MAKE) -f TestMakefile -i ConfigureAuthorizations
  
Line 233 
Line 229 
 ConfigureAuthorizations: ConfigureAuthorizations:
         cimauth -a -u guest -n test/cimv2 -R -W         cimauth -a -u guest -n test/cimv2 -R -W
         cimauth -a -u guest -n root/cimv2 -R -W         cimauth -a -u guest -n root/cimv2 -R -W
           cimauth -a -u guest -n root/PG_Internal -R -W
           cimauth -a -u guest -n root/PG_InterOp -R -W
           cimauth -a -u guest -n root/benchmark -R -W
           cimauth -a -u guest -n root/sampleprovider -R -W
         cimauth -a -u guest -n test/static -R -W         cimauth -a -u guest -n test/static -R -W
         cimauth -a -u guest -n root/SampleProvider -R -W         cimauth -a -u guest -n root/SampleProvider -R -W
         cimauth -a -u guest -n root -R -W         cimauth -a -u guest -n root -R -W
Line 253 
Line 253 
         sleep 10         sleep 10
  
 startcimWithSSL: startcimWithSSL:
         cimserver SSL=true          cimserver enableHttpConnection=false enableHttpsConnection=true
         sleep 10         sleep 10
  
 stopcim: stopcim:

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