テストの出力にテストグループ名追加

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

diff --git a/test/integration/casl2/Makefile b/test/integration/casl2/Makefile
index 6b81f1f..45c3f79 100644 (file)
--- a/test/integration/casl2/Makefile
+++ b/test/integration/casl2/Makefile
@@ -6,6 +6,7 @@
 # make cleanall: すべてのテストで、「make」と「make prepare」で生成されたファイルをクリア
 # make prepare : すべてのテストの、想定結果を出力
 # make create  : UNITNAMEで指定されたテストを新規に作成
+GROUPNAME = `pwd | xargs basename`
 TESTS = `ls | grep "^[^A-Z].*"`
 LOGFILE = Test.log
 
@@ -23,9 +24,9 @@ $(LOGFILE):
 report: $(LOGFILE)
        @success=`grep "Success" $(LOGFILE) | wc -l`; \
      all=`cat $(LOGFILE) | wc -l`; \
-     echo "$$success / $$all tests passed. Details in `pwd`/$(LOGFILE)"; \
+     echo "$(GROUPNAME): $$success / $$all tests passed. Details in `pwd`/$(LOGFILE)"; \
      if test $$success -eq $$all; then \
-       echo "All tests are succeded."; \
+       echo "$(GROUPNAME): All tests are succeded."; \
      fi
 clean:
        @for target in $(TESTS); do $(MAKE) clean -C $$target; done
@@ -50,11 +51,11 @@ ifdef ASFILE
        @echo 'ASFILE = $(ASFILE)' >>$(UNITNAME)/Makefile
 endif
 ifdef INFILE
-       @echo 'INFILE = $(INFILE)' >>$(UNITNAME)/Makefile
+       @echo 'INFILE = $$(INFILE)' >>$(UNITNAME)/Makefile
 endif
        @echo -n 'CMD = $$(CASL2) $$(CASL2FLAG) $$(ASFILE)' >>$(UNITNAME)/Makefile
 ifdef INFILE
-       @echo -n ' >$$(IN)' >>$(UNITNAME)/Makefile
+       @echo '< $$(INFILE)' >>$(UNITNAME)/Makefile
 endif
        @echo >>$(UNITNAME)/Makefile; \
      echo 'include ../TEST.mk' >>$(UNITNAME)/Makefile