From 1c07d7f40b6ee1fe1ed77c35bdbb41f128553fa9 Mon Sep 17 00:00:00 2001
From: j8takagi <j8takagi@nifty.com>
Date: Mon, 10 Jan 2011 23:55:04 +0900
Subject: [PATCH] =?utf8?q?=E3=83=AD=E3=82=B0=E3=83=95=E3=82=A1=E3=82=A4?=
 =?utf8?q?=E3=83=AB=E3=81=AE=E5=90=8D=E5=89=8D=E3=82=92=E5=A4=89=E6=9B=B4?=
 =?utf8?q?=E3=80=82make=20set=E3=80=81make=20reset=E3=81=AE=E5=8B=95?=
 =?utf8?q?=E4=BD=9C=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

グループのReport.log->Summary.log
テストのtest.log->summary.log
---
 template/Define.mk       | 2 +-
 template/Define_group.mk | 2 +-
 template/Makefile        | 2 --
 template/Test.mk         | 5 ++++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/template/Define.mk b/template/Define.mk
index 92e3b8e..18f6ffb 100644
--- a/template/Define.mk
+++ b/template/Define.mk
@@ -111,7 +111,7 @@ DIFF_FILE := diff.txt
 ERR_FILE := err.txt
 
 # テストログファイル
-LOG_FILE := test.log
+LOG_FILE := summary.log
 
 # 実行時間ファイル
 TIME_FILE := time.log
diff --git a/template/Define_group.mk b/template/Define_group.mk
index a572469..e2ab98f 100644
--- a/template/Define_group.mk
+++ b/template/Define_group.mk
@@ -16,7 +16,7 @@ TESTS = $(notdir $(shell $(FIND) -maxdepth 1 -name "[^A-Z.]*" -type d))
 GROUP_LOG_FILE := $(shell $(ECHO) $(GROUP) | $(TR) '[a-z]' '[A-Z]').log
 
 # テストグループレポートファイル
-GROUP_REPORT_FILE := Report.log
+GROUP_REPORT_FILE := Summary.log
 
 # テストグループ実行時間ファイル
 GROUP_TIME_FILE := $(shell echo $(GROUP) | $(TR) '[a-z]' '[A-Z]')_time.log
diff --git a/template/Makefile b/template/Makefile
index 3a7a1a8..d5acfb9 100644
--- a/template/Makefile
+++ b/template/Makefile
@@ -21,8 +21,6 @@ MKFILE_METHOD = $(if $(LINKMK),linkmk,copymk)
 group: groupdir $(MKFILE_METHOD)
 
 groupdir:
-	@$(call err_var_null,GROUPDIR)
-	@$(call err_file_ext,GROUPDIR)
 	@$(MKDIR) $(GROUPDIR)
 
 copymk:
diff --git a/template/Test.mk b/template/Test.mk
index 3a599f5..aae760f 100644
--- a/template/Test.mk
+++ b/template/Test.mk
@@ -31,10 +31,13 @@ checkall: clean $(DETAIL_FILE) $(TIME_FILE)
 	@$(call disp_test_log,$(LOG_FILE))
 
 set: $(CMD_FILE)
+	@$(call chk_file_ext,$(TEST0_FILE))
 	@-$(call exec_cmd,$(CMD_FILE),$(TEST0_FILE),$(ERR_FILE))
 	@$(CAT) $(TEST0_FILE)
 
-reset: cleanall set
+reset: cleanall
+	@-$(call exec_cmd,$(CMD_FILE),$(TEST0_FILE),$(ERR_FILE))
+	@$(CAT) $(TEST0_FILE)
 
 time: cleantime $(TIME_FILE)
 
-- 
2.18.0