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

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

version 1.4, 2002/04/02 07:24:58 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 =      STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)
   CIMSERVER_STOP_SERVICE =  
   SLEEP =  
   STRIPCRS = stripcrs $(RESULTFILE) | stripcrs $(MASTERRESULTFILE)  
   DIFF = mu compare   DIFF = mu compare
   REDIRECTERROR = 2>&1   REDIRECTERROR = 2>&1
 else else
   CIMSERVER_START_SERVICE = cimserver -d  
   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) $(RESULTFILE) $(MASTERRESULTFILE)      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
  
 default:  ifdef PEGASUS_TMP
       TMP_DIR = $(subst \,/,$(PEGASUS_TMP))
   else
 cimstop:      TMP_DIR = .
         $(CIMSERVER_STOP_SERVICE)  endif
         $(SLEEP)  
  
 cimstart:  default:
         $(CIMSERVER_START_SERVICE)  
         $(SLEEP)  
  
   #l10n
   messages: $(ERROR)


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

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2