From 295dbb72582804dbceaa8078c1abe574c9772002 Mon Sep 17 00:00:00 2001 From: j8takagi Date: Tue, 26 Jan 2010 08:47:37 +0900 Subject: [PATCH] =?utf8?q?=E3=80=8Cmake=20check=E3=80=8D=E3=80=8Cmake=20cl?= =?utf8?q?ean=E3=80=8D=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 「make check」は、常にすべての統合テストを実行 「make clean」は、常にソースとテストのディレクトリをクリア err.txtをクリアするよう修正 --- Makefile | 7 +++---- test/integration/Makefile | 11 ++++++----- test/integration/casl2/TEST.mk | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 2797559..21b5232 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,12 @@ prefix = $(HOME) +CLEANDIR = src test/integration test/unit .PHPNY: all clean check install uninstall all: make -C src check: - make -C test/integration + make -sC test/integration clean: - make -C src clean - make -C test/integration clean - make -C test/unit clean + @for target in $(CLEANDIR); do $(MAKE) -sC $$target clean; done install: all @if test -d $(prefix); then \ install -s ./casl2 $(prefix)/casl2; \ diff --git a/test/integration/Makefile b/test/integration/Makefile index b696573..e440002 100644 --- a/test/integration/Makefile +++ b/test/integration/Makefile @@ -1,6 +1,7 @@ YACASL2DIR=../.. -TARGETS = casl2 comet2 dumpword -.PHONY: all -all:$(TARGETS) -%: $(YACASL2DIR)/% - $(MAKE) -kC $@ +TESTGROUPS = casl2 comet2 dumpword +.PHONY: all clean +all: + @for target in $(TESTGROUPS); do $(MAKE) -sC $$target; done +clean: + @for target in $(TESTGROUPS); do $(MAKE) -sC $$target clean; done diff --git a/test/integration/casl2/TEST.mk b/test/integration/casl2/TEST.mk index e33df44..1f1dad3 100644 --- a/test/integration/casl2/TEST.mk +++ b/test/integration/casl2/TEST.mk @@ -12,7 +12,7 @@ UNITNAME = `pwd | xargs basename` check: clean report.txt prepare: cleanall 0.txt clean: - @rm -f 1.txt diff.txt report.txt + @rm -f 1.txt diff.txt report.txt err.txt cleanall: clean @rm -f 0.txt 0.txt 1.txt: $(CASL2) $(ASFILE) -- 2.18.0