projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doxygen用にコメント修正。関数のstatic指定を外す
[YACASL2.git]
/
test
/
system
/
casl2
/
Test.mk
diff --git
a/test/system/casl2/Test.mk
b/test/system/casl2/Test.mk
index
edfa278
..
216986e
100644
(file)
--- a/
test/system/casl2/Test.mk
+++ b/
test/system/casl2/Test.mk
@@
-13,26
+13,29
@@
# make clean : "make" で作成されたファイルをクリア
# make cleanall: "make" と "make set" で作成されたファイルをクリア
# make clean : "make" で作成されたファイルをクリア
# make cleanall: "make" と "make set" で作成されたファイルをクリア
-SHELL = /bin/sh
+SHELL = /bin/
ba
sh
# テスト名。カレントディレクトリー名から取得
TEST = $(notdir $(CURRDIR))
# テスト名。カレントディレクトリー名から取得
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))
.PHONY: check set reset time cleantime clean cleanall
check: clean $(DETAIL_FILE)
@$(call disp_test_log,$(LOG_FILE))
-checkall: c
heck
$(TIME_FILE)
+checkall: c
lean $(DETAIL_FILE)
$(TIME_FILE)
@$(CAT) $(TIME_FILE) >>$(LOG_FILE)
@$(call disp_test_log,$(LOG_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)
@$(CAT) $(TEST0_FILE)
+reset: cleanall set
+
time: cleantime $(TIME_FILE)
cleantime:
time: cleantime $(TIME_FILE)
cleantime:
@@
-44,22
+47,17
@@
clean:
cleanall: clean
@$(RM) $(TEST0_FILE)
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 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 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) $(CMD
SRC
_FILE) $(TEST0_FILE) $(ERR_FILE) $(DIFF_FILE) $(TEST1_FILE),$@)
$(TIME_FILE): $(CMD_FILE)
$(TIME_FILE): $(CMD_FILE)
-
@-$(call time_cmd,$(TEST)
,$^,$@)
+
$(call time_cmd
,$^,$@)