X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=test%2Fintegration%2Fcomet2%2FMakefile;h=e7e747d8c379ed4a545e48b18ab8b653618377dc;hb=ffe8e22a52a385d795889c5cabbde2f277342e32;hp=b1dd3b061f9d0b61ba82ff8d9f159a5a0488d350;hpb=fda1563ea37180835e0b9c6e7a9c7ae607895446;p=YACASL2.git

diff --git a/test/integration/comet2/Makefile b/test/integration/comet2/Makefile
index b1dd3b0..e7e747d 100644
--- a/test/integration/comet2/Makefile
+++ b/test/integration/comet2/Makefile
@@ -7,7 +7,7 @@
 # make prepare : すべてのテストの、想定結果を出力
 # make create  : UNITNAMEで指定されたテストを新規に作成
 TESTS = `ls | grep "^[^A-Z].*"`
-LOGFILE = TEST.log
+LOGFILE = Test.log
 
 .PHONY: all check report clean cleanall prepare create
 all: check report
@@ -18,7 +18,7 @@ check:
      done
 $(LOGFILE):
 	@for target in $(TESTS); do \
-         cat <$$target/report.txt >>$(LOGFILE) 2>/dev/null || echo "Failure:" $$target "no report" >>$(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`; \
@@ -63,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"