X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=test%2FMakefile.TESTGROUPS.mk;h=6e32f36819260260401528fbd3160733a3e2fec8;hp=22dd7ecaaab39e4f1e806bde5e0755578ae97303;hb=f9e27534c723ae199ed32404047b9a2c6519a8a9;hpb=a4a4d9291958ee920beaec963000248b9523389b

diff --git a/test/Makefile.TESTGROUPS.mk b/test/Makefile.TESTGROUPS.mk
index 22dd7ec..6e32f36 100644
--- a/test/Makefile.TESTGROUPS.mk
+++ b/test/Makefile.TESTGROUPS.mk
@@ -6,26 +6,27 @@
 # 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
 $(LOGFILE):
 	@for target in $(TESTS); do \
-         cat <$$target/report.txt >>$(LOGFILE); \
+         cat <$$target/report.txt >>$(LOGFILE) || echo $$target ": no report" >>$(LOGFILE); \
      done
 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
@@ -36,10 +37,10 @@ cleanall:
 prepare:
 	@for target in $(TESTS) ; do $(MAKE) prepare -C $$target ; done
 create:
-ifdef UNITNAME
+ifndef UNITNAME
+	@echo "no test created. set UNITNAME"
+else
 	@mkdir $(UNITNAME)
 	@echo 'CMD = ' >>$(UNITNAME)/Makefile; \
      echo 'include ../TEST.mk' >>$(UNITNAME)/Makefile
-else
-	@echo "no test created. set UNITNAME"
 endif