From 7730d6872a2d7350d5d3f2823ddb4eaf19190743 Mon Sep 17 00:00:00 2001
From: j8takagi <j8takagi@nifty.com>
Date: Thu, 16 Dec 2010 23:01:49 +0900
Subject: [PATCH] =?utf8?q?CASL2=E3=81=AE=E3=83=86=E3=82=B9=E3=83=88?=
 =?utf8?q?=E6=99=82=E3=81=AB=E7=99=BA=E7=94=9F=E3=81=97=E3=81=9F=E5=95=8F?=
 =?utf8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

想定ファイルが、実行時に書き換えられる問題を修正
想定ファイルが実在する場合に、実在しないエラーになるのを修正
---
 template/Define_test.mk |  1 -
 template/Test.mk        | 11 +++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/template/Define_test.mk b/template/Define_test.mk
index 65bfcaf..c24f22d 100644
--- a/template/Define_test.mk
+++ b/template/Define_test.mk
@@ -61,7 +61,6 @@ endef
 # 引数は、対象ファイル群、出力ファイル
 # 用例: $(call report_files,list_file_target,file_out)
 define report_files
-    $(call chk_file_ext,$2)
     $(foreach tfile,$1,$(call report_file,$(tfile),$2))
 endef
 
diff --git a/template/Test.mk b/template/Test.mk
index 8e2628d..ce657bd 100644
--- 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),$^,$@)
-- 
2.18.0