X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=test%2Fsystem%2Fcasl2%2FTest.mk;h=216986eb36f2bc729d6541eb76c0ae3c9cb0688e;hp=edfa2786237e7c510412c98057d0ca8807a80198;hb=7f7bde5dd1305cfc598fe09030c69aad0dc01368;hpb=c5e30b2f26ebc174c49c52c67121f3be81b5bd43

diff --git a/test/system/casl2/Test.mk b/test/system/casl2/Test.mk
index edfa278..216986e 100644
--- a/test/system/casl2/Test.mk
+++ b/test/system/casl2/Test.mk
@@ -13,26 +13,29 @@
 # make clean   : "make" で作成されたファイルをクリア
 # make cleanall: "make" と "make set" で作成されたファイルをクリア
 
-SHELL = /bin/sh
+SHELL = /bin/bash
 
 # テスト名。カレントディレクトリー名から取得
 TEST = $(notdir $(CURRDIR))
 
+# コマンドファイルのソース
+CMDSRC_FILE ?= $(CMD_FILE)
+
 .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:
+	@-$(call exec_cmd,$(CMD_FILE),$(TEST0_FILE),$(ERR_FILE))
 	@$(CAT) $(TEST0_FILE)
 
+reset: cleanall set
+
 time: cleantime $(TIME_FILE)
 
 cleantime:
@@ -44,22 +47,17 @@ clean:
 cleanall: clean
 	@$(RM) $(TEST0_FILE)
 
-$(CMD_FILE):
-	@$(call chk_file_notext,$@)
-	@$(CHMOD) u+x $@
-
-$(TEST0_FILE) $(TEST1_FILE): $(CMD_FILE)
+$(TEST1_FILE): $(CMD_FILE)
 	@-$(call exec_cmd,$^,$@,$(ERR_FILE))
 
 $(DIFF_FILE): $(TEST0_FILE) $(TEST1_FILE)
-	@$(call chk_file_notext,$(TEST0_FILE))
 	@-$(call diff_files,$^,$@)
 
 $(LOG_FILE): $(DIFF_FILE)
 	@$(call test_log,$(TEST),$^,$@)
 
 $(DETAIL_FILE): $(LOG_FILE)
-	@$(call report_files,$(LOG_FILE) $(CMD_FILE) $(TEST0_FILE) $(ERR_FILE) $(DIFF_FILE) $(TEST1_FILE),$@)
+	@$(call report_files,$(LOG_FILE) $(CMDSRC_FILE) $(TEST0_FILE) $(ERR_FILE) $(DIFF_FILE) $(TEST1_FILE),$@)
 
 $(TIME_FILE): $(CMD_FILE)
-	@-$(call time_cmd,$(TEST),$^,$@)
+	$(call time_cmd,$^,$@)