X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=test%2Funit%2FTest.mk;h=ada87aee33ffe4cbe875d0afcdd1e85aa08b0e43;hb=456e72090c786b40ac10ee984617afc054555f4d;hp=8e2628d2540118d9b5a5f0af4dd823f52cecf9a2;hpb=95b87bd10068d4f0f65912a7678d0aba8463724c;p=YACASL2.git

diff --git a/test/unit/Test.mk b/test/unit/Test.mk
index 8e2628d..ada87ae 100644
--- a/test/unit/Test.mk
+++ b/test/unit/Test.mk
@@ -13,30 +13,29 @@
 # make clean   : "make" で作成されたファイルをクリア
 # make cleanall: "make" と "make set" で作成されたファイルをクリア
 
-SHELL = /bin/sh
+SHELL = /bin/bash
 
 # テスト名。カレントディレクトリー名から取得
 TEST = $(notdir $(CURRDIR))
 
 # コマンドファイルのソース
-#CMDSRC_FILE := $(CMD_FILE)
-CMDSRC_FILE := $(CMD_FILE).c
+CMDSRC_FILE = $(CMD_FILE).c
 
 .PHONY: check set reset time cleantime clean cleanall
 
 check: clean $(DETAIL_FILE)
 	@$(call disp_test_log,$(LOG_FILE))
 
-checkall: check $(TIME_FILE)
+checkall: clean $(DETAIL_FILE) $(TIME_FILE)
 	@$(CAT) $(TIME_FILE) >>$(LOG_FILE)
 	@$(call disp_test_log,$(LOG_FILE))
 
-set: $(TEST0_FILE)
-	@$(CAT) $^
-
-reset: cleanall $(TEST0_FILE)
+set: $(CMD_FILE)
+	@-$(call exec_cmd,$(CMD_FILE),$(TEST0_FILE),$(ERR_FILE))
 	@$(CAT) $(TEST0_FILE)
 
+reset: cleanall set
+
 time: cleantime $(TIME_FILE)
 
 cleantime:
@@ -48,7 +47,7 @@ clean:
 cleanall: clean
 	@$(RM) $(TEST0_FILE)
 
-$(TEST0_FILE) $(TEST1_FILE): $(CMD_FILE)
+$(TEST1_FILE): $(CMD_FILE)
 	@-$(call exec_cmd,$^,$@,$(ERR_FILE))
 
 $(DIFF_FILE): $(TEST0_FILE) $(TEST1_FILE)
@@ -61,5 +60,4 @@ $(DETAIL_FILE): $(LOG_FILE)
 	@$(call report_files,$(LOG_FILE) $(CMDSRC_FILE) $(TEST0_FILE) $(ERR_FILE) $(DIFF_FILE) $(TEST1_FILE),$@)
 
 $(TIME_FILE): $(CMD_FILE)
-	@if test ! -x $^; then $(CHMOD) u+x $^; fi
-	@-$(call time_cmd,$(TEST),$^,$@)
+	$(call time_cmd,$^,$@)