From: j8takagi <j8takagi@nifty.com>
Date: Tue, 21 Dec 2010 03:34:34 +0000 (+0900)
Subject: Merge branch 'master' of linux
X-Git-Tag: v0.1p15~12
X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=commitdiff_plain;h=2d3d185962d2997a08cd2e674868cea35b99ae04;hp=0d225ac1f580c59da7a063ef52da35c0af254dd3

Merge branch 'master' of linux

Conflicts:
	test/system/casl2/Test.mk
---

diff --git a/test/system/casl2/Test.mk b/test/system/casl2/Test.mk
index c231512..8da44c1 100644
--- a/test/system/casl2/Test.mk
+++ b/test/system/casl2/Test.mk
@@ -32,8 +32,8 @@ checkall: clean $(DETAIL_FILE) $(TIME_FILE)
 	@$(call disp_test_log,$(LOG_FILE))
 
 set:
-	@-$(call exec_cmd,$^,$@,$(ERR_FILE))
-	@$(CAT) $^
+	@-$(call exec_cmd,$(CMD_FILE),$(TEST0_FILE),$(ERR_FILE))
+	@$(CAT) $(TEST0_FILE)
 
 reset: cleanall set
 
diff --git a/test/system/comet2/Test.mk b/test/system/comet2/Test.mk
index 023bce0..8da44c1 100644
--- a/test/system/comet2/Test.mk
+++ b/test/system/comet2/Test.mk
@@ -31,9 +31,9 @@ checkall: clean $(DETAIL_FILE) $(TIME_FILE)
 	@$(CAT) $(TIME_FILE) >>$(LOG_FILE)
 	@$(call disp_test_log,$(LOG_FILE))
 
-set: $(TEST0_FILE)
-	@-$(call exec_cmd,$^,$@,$(ERR_FILE))
-	@$(CAT) $^
+set:
+	@-$(call exec_cmd,$(CMD_FILE),$(TEST0_FILE),$(ERR_FILE))
+	@$(CAT) $(TEST0_FILE)
 
 reset: cleanall set
 
diff --git a/test/system/dumpword/Test.mk b/test/system/dumpword/Test.mk
index 023bce0..8da44c1 100644
--- a/test/system/dumpword/Test.mk
+++ b/test/system/dumpword/Test.mk
@@ -31,9 +31,9 @@ checkall: clean $(DETAIL_FILE) $(TIME_FILE)
 	@$(CAT) $(TIME_FILE) >>$(LOG_FILE)
 	@$(call disp_test_log,$(LOG_FILE))
 
-set: $(TEST0_FILE)
-	@-$(call exec_cmd,$^,$@,$(ERR_FILE))
-	@$(CAT) $^
+set:
+	@-$(call exec_cmd,$(CMD_FILE),$(TEST0_FILE),$(ERR_FILE))
+	@$(CAT) $(TEST0_FILE)
 
 reset: cleanall set