(file) Return to commands.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/commands.mak between version 1.46.2.3 and 1.50

version 1.46.2.3, 2006/10/20 14:40:39 version 1.50, 2006/12/11 20:04:47
Line 275 
Line 275 
     DIFF = mu compare     DIFF = mu compare
     SORT = mu sort     SORT = mu sort
     REDIRECTERROR = $(MUEXE) echo "REDIRECTERROR not defined in commands.mak"     REDIRECTERROR = $(MUEXE) echo "REDIRECTERROR not defined in commands.mak"
     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)      CIMSERVER_START_SERVICE_DELAY = 20
       CIMSERVER_START_SERVICE = pipe ($(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS) &) && mu sleep $(CIMSERVER_START_SERVICE_DELAY)
     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
     SLEEP = $(MUEXE) sleep     SLEEP = $(MUEXE) sleep
     TIME_CMD =     TIME_CMD =
Line 353 
Line 354 
         CMPIR_STOP_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon --stop         CMPIR_STOP_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon --stop
     endif     endif
 else else
     CMPIR_START_DAEMON =      CMPIR_START_DAEMON = $(ECHO) "(CMPIR_START_DAEMON command ignored)"
     CMPIR_STOP_DAEMON =      CMPIR_STOP_DAEMON =  $(ECHO) "(CMPIR_STOP_DAEMON command ignored)"
   
 endif endif
  
 ifndef TMP_DIR ifndef TMP_DIR
Line 468 
Line 470 
 ##       cimstart command. ##       cimstart command.
 ## ##
 runTestSuite: CMDSFORCE runTestSuite: CMDSFORCE
         make -f TestMakefile -i cimstop          -$(CIMSERVER_STOP_SERVICE)
         make -f TestMakefile cimstart          -$(CMPIR_STOP_DAEMON)
           $(CIMSERVER_START_SERVICE)
           $(CMPIR_START_DAEMON)
         $(WINDOWS_ONLY_SLEEP)         $(WINDOWS_ONLY_SLEEP)
         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))         $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i)))
         make -f TestMakefile cimstop          $(CIMSERVER_STOP_SERVICE)
           $(CMPIR_STOP_DAEMON)
  
 ifndef PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN ifndef PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN
   PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN=$(GET_HOSTNAME)   PEGASUS_SSLCNF_FULLY_QUALIFIED_DSN=$(GET_HOSTNAME)


Legend:
Removed from v.1.46.2.3  
changed lines
  Added in v.1.50

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2