CASL2のテスト時に発生した問題を修正

[autotest_mk.git] / template / Test.mk

diff --git a/template/Test.mk b/template/Test.mk
index 8e2628d..ce657bd 100644 (file)
--- a/template/Test.mk
+++ b/template/Test.mk
@@ -19,8 +19,8 @@ SHELL = /bin/sh
 TEST = $(notdir $(CURRDIR))
 
 # コマンドファイルのソース
-#CMDSRC_FILE := $(CMD_FILE)
-CMDSRC_FILE := $(CMD_FILE).c
+CMDSRC_FILE := $(CMD_FILE)
+#CMDSRC_FILE := $(CMD_FILE).c
 
 .PHONY: check set reset time cleantime clean cleanall
 
@@ -32,10 +32,10 @@ checkall: check $(TIME_FILE)
        @$(call disp_test_log,$(LOG_FILE))
 
 set: $(TEST0_FILE)
+       @-$(call exec_cmd,$^,$@,$(ERR_FILE))
        @$(CAT) $^
 
-reset: cleanall $(TEST0_FILE)
-       @$(CAT) $(TEST0_FILE)
+reset: cleanall set
 
 time: cleantime $(TIME_FILE)
 
@@ -48,7 +48,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 +61,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),$^,$@)