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

Diff for /pegasus/TestMakefile between version 1.7 and 1.11

version 1.7, 2003/06/14 19:25:37 version 1.11, 2004/01/13 21:07:09
Line 39 
Line 39 
  
 ifeq ($(OS),HPUX) ifeq ($(OS),HPUX)
   CIMSERVER_START_SERVICE = cimserver   CIMSERVER_START_SERVICE = cimserver
   CIMSERVER_STOP_SERVICE = cimserver -s    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)   COPYMU = cp -f src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)
Line 49 
Line 49 
  
 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)   COPYMU = cp -f src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)
Line 217 
Line 217 
  
 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 233 
 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 257 
         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  
changed lines
  Added in v.1.11

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2