version 1.12, 2005/02/11 00:22:16
|
version 1.14, 2005/03/25 04:39:43
|
|
|
ifeq ($(PEGASUS_PLATFORM), WIN32_IX86_MSVC) | ifeq ($(PEGASUS_PLATFORM), WIN32_IX86_MSVC) |
STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE) | STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE) |
DIFF = mu compare |
|
REDIRECTERROR = 2>&1 | REDIRECTERROR = 2>&1 |
else | else |
STRIPCRS = | STRIPCRS = |
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 |