X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=test%2Fintegration%2Fcasl2%2FMakefile;h=4232b19597f3bd6c34994d6abc6418b8ecf2b140;hp=f38b79d878b9a7de1b0dcf13fbd2611349b49982;hb=851e22754474ae6518109b5485130dcf86f7f880;hpb=5a84169c51f754a58929ce360e9e1a358e0ca74e

diff --git a/test/integration/casl2/Makefile b/test/integration/casl2/Makefile
index f38b79d..4232b19 100644
--- a/test/integration/casl2/Makefile
+++ b/test/integration/casl2/Makefile
@@ -6,16 +6,15 @@
 # make cleanall: すべてのテストで、「make」と「make prepare」で生成されたファイルをクリア
 # make prepare : すべてのテストの、想定結果を出力
 # make create  : UNITNAMEで指定されたテストを新規に作成
+GROUPNAME = `pwd | xargs basename`
 TESTS = `ls | grep "^[^A-Z].*"`
 LOGFILE = Test.log
 
-.PHONY: all check report clean cleanall prepare create
-all: check report
-check:
+.PHONY: all check checkeach report clean cleanall prepare create
+check: checkeach report
+checkeach:
 	@rm -f $(LOGFILE)
-	@for target in $(TESTS); do \
-         $(MAKE) check -C $$target; \
-     done
+	@for target in $(TESTS); do $(MAKE) check -C $$target; done
 $(LOGFILE):
 	@for target in $(TESTS); do \
          cat <$$target/report.txt >>$(LOGFILE) || echo $$target ": no report" >>$(LOGFILE); \
@@ -23,9 +22,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 +49,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