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

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

diff --git a/test/integration/comet2/Makefile b/test/integration/comet2/Makefile
index e7e747d..2da7452 100644 (file)
--- a/test/integration/comet2/Makefile
+++ b/test/integration/comet2/Makefile
@@ -6,65 +6,58 @@
 # 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 \
-         if test -s $^; then cat <$$target/report.txt >>$(LOGFILE); else echo "Failure:" $$target "no report" >>$(LOGFILE); fi; \
+         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
+       @for target in $(TESTS); do $(MAKE) clean -C $$target; done
        @rm -f $(LOGFILE)
 cleanall:
-       @for target in $(TESTS); do \
-         $(MAKE) cleanall -C $$target; \
-     done
+       @for target in $(TESTS); do $(MAKE) cleanall -C $$target; done
        @rm -f $(LOGFILE)
 prepare:
-       @for target in $(TESTS) ; do \
-         $(MAKE) prepare -C $$target ;\
-     done
+       @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 'include ../CMD.mk    # YACASL2DIR, CASL2, COMET2' >$(UNITNAME)/Makefile
-ifdef CASL2FLAG
-       @echo 'CASL2FLAG = $(CASL2FLAG)' >>$(UNITNAME)/Makefile
-else
-       @echo 'CASL2FLAG = -la' >>$(UNITNAME)/Makefile
+ifdef COMET2FLAG
+       @echo 'COMET2FLAG = $(COMET2FLAG)' >>$(UNITNAME)/Makefile
 endif
-ifdef ASDIR
-       @echo 'ASDIR = $(ASDIR)' >>$(UNITNAME)/Makefile
-else
        @echo 'ASDIR = $$(YACASL2DIR)/as' >>$(UNITNAME)/Makefile
-endif
+       @echo 'CASL2LIBDIR = $$(YACASL2DIR)/as/casl2lib' >>$(UNITNAME)/Makefile
 ifdef ASFILE
        @echo 'ASFILE = $(ASFILE)' >>$(UNITNAME)/Makefile
-else
-       @echo 'ASFILE = $$(ASDIR)/$(UNITNAME).casl' >>$(UNITNAME)/Makefile
 endif
+       @echo 'ASCMD = $$(CASL2) $$(CASL2FLAG) -O $(ASFILE)' >>$(UNITNAME)/Makefile
 ifdef INFILE
-       @echo 'IN = <$(INFILE)' >>$(UNITNAME)/Makefile
+       @echo 'INFILE = $$(INFILE)' >>$(UNITNAME)/Makefile
 endif
-       @echo 'CMD = $$(COMET2) $$(COMET2FLAG) $$(OBJFILE)' >>$(UNITNAME)/Makefile; \
+       @echo -n 'EXECCMD = $$(COMET2) $$(COMET2FLAG) $$(OBJFILE)' >>$(UNITNAME)/Makefile
+ifdef INFILE
+       @echo '< $$(INFILE)' >>$(UNITNAME)/Makefile
+endif
+       @echo >>$(UNITNAME)/Makefile; \
      echo 'include ../TEST.mk' >>$(UNITNAME)/Makefile
-else
-       @echo "no test created. set UNITNAME"
 endif