CALL命令で、ローカルレベルも読み込めるように仕様変更

[YACASL2.git] / test / integration / comet2 / Makefile

diff --git a/test/integration/comet2/Makefile b/test/integration/comet2/Makefile
index c90f916..d60aaa1 100644 (file)
--- a/test/integration/comet2/Makefile
+++ b/test/integration/comet2/Makefile
@@ -18,7 +18,7 @@ check:
      done
 $(LOGFILE):
        @for target in $(TESTS); do \
-         cat <$$target/report.txt >>$(LOGFILE); \
+         if test -s $^; then cat <$$target/report.txt >>$(LOGFILE); else echo "Failure:" $$target "no report" >>$(LOGFILE); fi; \
      done
 report: $(LOGFILE)
        @success=`grep "Success" $(LOGFILE) | wc -l`; \
@@ -26,8 +26,6 @@ report: $(LOGFILE)
      echo "$$success / $$all tests passed. Details in `pwd`/$(LOGFILE)"; \
      if test $$success -eq $$all; then \
        echo "All tests are succeded."; \
-     else \
-       grep "Failure" $(LOGFILE); \
      fi
 clean:
        @for target in $(TESTS); do \
@@ -65,7 +63,7 @@ endif
 ifdef INFILE
        @echo 'IN = <$(INFILE)' >>$(UNITNAME)/Makefile
 endif
-       @echo 'CMD = $$(COMET2) $$(COMET2FLAG) $$(UNITNAME).o $$(IN)' >>$(UNITNAME)/Makefile; \
+       @echo 'CMD = $$(COMET2) $$(COMET2FLAG) $$(OBJFILE)' >>$(UNITNAME)/Makefile; \
      echo 'include ../TEST.mk' >>$(UNITNAME)/Makefile
 else
        @echo "no test created. set UNITNAME"