テストを、Mac OS X Snow Leopardでも正常にできるよう修正

[YACASL2.git] / test / integration / dumpword / TEST.mk

diff --git a/test/integration/dumpword/TEST.mk b/test/integration/dumpword/TEST.mk
index ff85704..43ddf41 100644 (file)
--- a/test/integration/dumpword/TEST.mk
+++ b/test/integration/dumpword/TEST.mk
@@ -12,17 +12,15 @@ TESTSH = test.sh
 check: clean report.txt
 prepare: cleanall 0.txt
 clean:
-       @rm -f 1.txt diff.txt report.txt
+       @rm -f 1.txt diff.txt report.txt err.txt
 cleanall: clean
-       @rm -f 0.txt
+       @rm -f 0.txt test.sh
 0.txt 1.txt: $(DUMPWORD) $(TESTSH)
        @sh $(TESTSH) >>$@ 2>$(ERRFILE); \
      if test -s $(ERRFILE); then cat err.txt >>$@; else rm -f $(ERRFILE); fi
-$(TESTSH): ../HEX.txt
+$(TESTSH): $(ARGFILE)
        @xargs -n1 echo "$(DUMPWORD) $(DUMPWORDFLAG) " <$^ >$@
 diff.txt: 1.txt
-       @-diff 0.txt 1.txt >$@ 2>&1
+       @-diff -c 0.txt 1.txt >$@ 2>&1
 report.txt: diff.txt
-       @echo -n "$(UNITNAME): Test " >$@; \
-     if test ! -s $^; then echo -n "Success " >>$@; rm -f $^; else echo -n "Failure " >>$@; fi; \
-     echo `date +"%F %T"` >>$@
+       @if test ! -s $^; then echo "$(UNITNAME): Test Success " `date +"%F %T"` >>$@; rm -f $^; else echo "$(UNITNAME): Test Failure " `date +"%F %T"` >>$@; fi; \