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

Diff for /pegasus/mak/test.mak between version 1.10 and 1.13

version 1.10, 2003/08/08 11:47:32 version 1.13, 2005/03/24 22:30:24
Line 1 
Line 1 
 ifeq ($(PEGASUS_PLATFORM), WIN32_IX86_MSVC) ifeq ($(PEGASUS_PLATFORM), WIN32_IX86_MSVC)
   CIMSERVER_START_SERVICE =  
   CIMSERVER_STOP_SERVICE =  
   SLEEP =  
   STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)   STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)
   DIFF = mu compare   DIFF = mu compare
   REDIRECTERROR = 2>&1   REDIRECTERROR = 2>&1
 else else
   CIMSERVER_START_SERVICE = cimserver  
   CIMSERVER_STOP_SERVICE = /usr/bin/ps -ef | /usr/bin/grep cimserver | /usr/bin/grep -v grep | /usr/bin/awk '{print "kill -9 "$$2 |"/usr/bin/sh"}'  
   SLEEP = sleep 5  
   STRIPCRS =   STRIPCRS =
   DIFF = diff   DIFF = diff
   REDIRECTERROR = 2>&1   REDIRECTERROR = 2>&1
 endif endif
  
   PEGASUS_XML_ORDERING_DEFECT_ENCOUNTERED=on
   
 ifdef DIFF ifdef DIFF
   COMPARERESULTS = @$(DIFF) $(MASTERRESULTFILE) $(RESULTFILE)   COMPARERESULTS = @$(DIFF) $(MASTERRESULTFILE) $(RESULTFILE)
       COMPARERESULTS_DS = @$(call DIFFSORT,$(MASTERRESULTFILE),$(RESULTFILE))
 else else
   COMPARERESULTS = @$(ECHO) "Results not compared."   COMPARERESULTS = @$(ECHO) "Results not compared."
       COMPARERESULTS_DS = @$(ECHO) "Results not compared."
 endif endif
  
 ifdef PEGASUS_TMP ifdef PEGASUS_TMP
Line 30 
Line 28 
  
 #l10n #l10n
 messages: $(ERROR) messages: $(ERROR)
   
 cimstop:  
         $(CIMSERVER_STOP_SERVICE)  
         $(SLEEP)  
   
 cimstart:  
         $(CIMSERVER_START_SERVICE)  
         $(SLEEP)  
   


Legend:
Removed from v.1.10  
changed lines
  Added in v.1.13

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2