From: j8takagi <j8takagi@nifty.com> Date: Mon, 29 Nov 2010 08:23:25 +0000 (+0900) Subject: グループファイル作成時、テスト用のMakefileはコピーするほかに、テンプレートにリンクできるよう仕様変更 X-Git-Tag: 0.2p3~48 X-Git-Url: http://www.j8takagi.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b416db9b1dc29026ef751c2a836c5d63281e205;p=autotest_mk.git グループファイル作成時、テスト用のMakefileはコピーするほかに、テンプレートにリンクできるよう仕様変更 --- diff --git a/sample/hoc1/test/Define.mk b/sample/hoc1/test/Define.mk deleted file mode 100644 index 18813ff..0000000 --- a/sample/hoc1/test/Define.mk +++ /dev/null @@ -1,125 +0,0 @@ -# autotest.mk > test_template > Define.mk -# èªåãã¹ãç¨ã®å¤æ°ããã¯ãå®ç¾© - -ifndef DEFINE_INCLUDED -DEFINE_INCLUDED = 1 - -# ç¾å¨ã®æ¥æ -DATE = $(shell date +"%F %T") - -# ç¾å¨ã®ãã£ã¬ã¯ããªã¼ -CURRDIR = $(shell pwd) - -# Makefile -MAKEFILE := Makefile - -###################################################################### -# ã³ãã³ã -###################################################################### - -CP ?= cp - -CAT ?= cat - -MKDIR ?= mkdir - -RM ?= rm -f - -ECHO ?= echo - -TIME ?= /usr/bin/time --quiet - -DIFF ?= diff -c - -DEV_NULL ?= /dev/null - -CHMOD ?= chmod - -GREP ?= grep - -LINECOUNT ?= wc -l - -FIND ?= find - -TR ?= tr - -EXPR ?= expr -###################################################################### -# ãã¹ãã°ã«ã¼ãã¨ãã¹ãã§ã®å ±éãã¯ã -###################################################################### - -# chk_var_null: 弿°ãNULLã®å ´åãã¨ã©ã¼ -# ç¨ä¾: $(call chk_var_null,var) -define chk_var_null - $(if $1,,$(error NULL argument)) -endef - -# chk_file_ext: æå®ããããã¡ã¤ã«ãå®å¨ããå ´åãã¨ã©ã¼ -# ç¨ä¾: $(call chk_file_ext,file) -define chk_file_ext - $(if $(wildcard $1),$(error $1 exists in $(CURRDIR))) -endef - -# chk_file_notext: æå®ããããã¡ã¤ã«ãå®å¨ããªãå ´åãã¨ã©ã¼ -# ç¨ä¾: $(call chk_file_notext,file) -define chk_file_notext - $(if $(wildcard $1),,$(error $1 not exists in $(CURRDIR))) -endef - -###################################################################### -# ãã¹ãã°ã«ã¼ãã®ãã£ã¬ã¯ããªã¼ -###################################################################### - -# ãã¹ãã°ã«ã¼ãã¨ãã¹ãã®å¤æ°ãå®ç¾©ããMakefile -DEF_FILE := Define.mk - -# ãã¹ãã°ã«ã¼ãã®å¤æ°ãå®ç¾©ããMakefile -DEF_GROUP_FILE := Define_group.mk - -# ãã¹ãã®å¤æ°ãå®ç¾©ããMakefile -DEF_TEST_FILE := Define_test.mk - -# ãã¹ãã®ã¿ã¼ã²ãããå®ç¾©ããMakefile -TEST_MAKEFILE := Test.mk - -# ãã¹ã¦ã®Makefile群 -MAKEFILES := $(DEF_FILE) $(DEF_GROUP_FILE) $(DEF_TEST_FILE) $(TEST_MAKEFILE) - -# ãã¹ããã¨ã®Makefileã§ã¤ã³ã¯ã«ã¼ãããMakefile群 -TEST_MAKEFILES := $(DEF_FILE) $(DEF_TEST_FILE) $(TEST_MAKEFILE) - -###################################################################### -# ãã¹ãã®ãã£ã¬ã¯ããªã¼ -###################################################################### - -# ãã¹ãã³ãã³ããã¡ã¤ã« -CMD_FILE := cmd - -# ãã¹ã説æãã¡ã¤ã« -DESC_FILE := desc.txt - -# ãã¹ãæ³å®çµæãã¡ã¤ã« -TEST0_FILE := 0.txt - -# ãã¹ãçµæãã¡ã¤ã« -TEST1_FILE := 1.txt - -# ãã¹ãã®ãæ³å®çµæã¨çµæã®å·®åãã¡ã¤ã« -DIFF_FILE := diff.txt - -# ãã¹ãã¨ã©ã¼ãã¡ã¤ã« -ERR_FILE := err.txt - -# ãã¹ããã°ãã¡ã¤ã« -LOG_FILE := test.log - -# å®è¡æéãã¡ã¤ã« -TIME_FILE := time.log - -# ãã¹ã詳細ã¬ãã¼ããã¡ã¤ã« -DETAIL_FILE := detail.log - -# ãã¹ãã®çµæã¨ãã¦ä½æããããã¡ã¤ã«ç¾¤ -TEST_RES_FILES := $(TEST1_FILE) $(DIFF_FILE) $(ERR_FILE) $(LOG_FILE) $(DETAIL_FILE) $(TIME_FILE) - -endif diff --git a/sample/hoc1/test/Define.mk b/sample/hoc1/test/Define.mk new file mode 120000 index 0000000..23af1e7 --- /dev/null +++ b/sample/hoc1/test/Define.mk @@ -0,0 +1 @@ +/home/kazubito/2010_11/autotest.mk/template/Define.mk \ No newline at end of file diff --git a/sample/hoc1/test/Define_group.mk b/sample/hoc1/test/Define_group.mk deleted file mode 100644 index f3cda2c..0000000 --- a/sample/hoc1/test/Define_group.mk +++ /dev/null @@ -1,95 +0,0 @@ -###################################################################### -# ãã¹ãã°ã«ã¼ãã®ãã£ã¬ã¯ããªã¼ -# ã»ãã«ãDefine.mkã§ãä¸é¨å®ç¾© -###################################################################### - -# ã°ã«ã¼ããã£ã¬ã¯ããªã¼ -GROUP_DIR := $(CURRDIR) - -# ã°ã«ã¼ãåããã£ã¬ã¯ããªåããåå¾ -GROUP := $(notdir $(GROUP_DIR)) - -# ãã¹ãåãã«ã¬ã³ããã£ã¬ã¯ããªã¼å ã®ãååã大æåã¾ãã¯.以å¤ã§å§ã¾ããã£ã¬ã¯ããªã¼ -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_TIME_FILE := $(shell echo $(GROUP) | $(TR) '[a-z]' '[A-Z]')_time.log - -# ã°ã«ã¼ãã§ããã¹ãçµæã¨ãã¦ä½æããããã¡ã¤ã«ç¾¤ -GROUP_RES_FILES := $(GROUP_LOG_FILE) $(GROUP_REPORT_FILE) $(GROUP_TIME_FILE) - -# ãã¹ããã¨ã®ãã°ãã¡ã¤ã« -TEST_LOG_FILES := $(foreach test,$(TESTS),$(test)/$(LOG_FILE)) - -###################################################################### -# ãã¹ãã°ã«ã¼ãã®ãã¯ã -###################################################################### - -# æå®ãããã£ã¬ã¯ããªã¼ã使 -# ç¨ä¾: $(call create_dir,name) -define create_dir - $(call chk_var_null,$1) - $(call chk_file_ext,$1) - $(MKDIR) $1 -endef - -# ãªã¹ãã§æå®ããã親ãã£ã¬ã¯ããªã¼ã«ããMakefileãã¤ã³ã¯ã«ã¼ãããMakefileã使 -# ç¨ä¾: $(call create_makefile,file,list_include_file) -define create_makefile - $(RM) $1 - $(foreach infile,$2,$(ECHO) "include ../$(infile)" >>$1; ) -endef - -# ãã¹ããã¨ã®ãã¡ã¤ã«ãã°ã«ã¼ããã¡ã¤ã«ã«åºå -# 弿°ã¯ããã¹ãã®ãªã¹ããã°ã«ã¼ããã¡ã¤ã«ããã¹ããã¡ã¤ã« -# ç¨ä¾: $(call group_log,files_test_log,file_group_log) -define group_log - $(foreach target,$1,$(call group_log_each,$(target),$2)) -endef - -# ãã¹ãã®ãã°ãã¡ã¤ã«ãã°ã«ã¼ããã°ãã¡ã¤ã«ã«åºåã弿°ã¯ããã¹ããã°ã«ã¼ããã°ãã¡ã¤ã« -# ç¨ä¾: $(call group_log_each,file_test_log,file_group_log) -define group_log_each - if test -s $1; then $(CAT) $1 >>$2; else $(ECHO) $(dir $1)": no log" >>$2; fi - $(ECHO) >>$2; - -endef - -# æåãããã¹ãã®æ°ããã¹ãã°ã«ã¼ããã°ãã¡ã¤ã«ããåå¾ -SUCCESS_TEST = $(shell $(GREP) "^[^A-Z.].*: Test Success" $(GROUP_LOG_FILE) | $(LINECOUNT)) - -# 失æãããã¹ãã®æ°ããã¹ãã°ã«ã¼ããã°ãã¡ã¤ã«ããåå¾ -FAIL_TEST = $(shell $(GREP) "^[^A-Z.].*: Test Failure" $(GROUP_LOG_FILE) | $(LINECOUNT)) - -# ãã¹ã¦ã®ãã¹ãã®æ° -ALL_TEST = $(shell $(EXPR) $(SUCCESS_TEST) + $(FAIL_TEST)) - -# ãã¹ããã¨ã®å®è¡æéãã¡ã¤ã« -TEST_TIME_FILES := $(foreach test,$(TESTS),$(test)/$(TIME_FILE)) - -# ãã¹ãã®çµæããã°ã«ã¼ããã°ãã¡ã¤ã«ãå ã«ã¬ãã¼ãã -# 弿°ã¯ãã°ã«ã¼ãåãã°ã«ã¼ããã°ãã¡ã¤ã«ãã°ã«ã¼ãã¬ãã¼ããã¡ã¤ã« -# ç¨ä¾: $(call group_report,name,file_log,file_report) -define group_report - $(ECHO) "$1: $(SUCCESS_TEST) / $(ALL_TEST) tests passed. Detail in $(GROUP_DIR)/$2" >$3; - if test $(FAIL_TEST) -eq 0; then $(ECHO) "$1: All tests are succeded." >>$3; fi -endef - -# ãªã¹ãã§æå®ãããã£ã¬ã¯ããªã¼ã§makeãå®è¡ -# ç¨ä¾: $(call make_tests,list_dir,target) -define make_tests - $(foreach dir,$1,$(call make_test_each,$(dir),$2)) -endef - -# æå®ãããã£ã¬ã¯ããªã¼ã§makeãå®è¡ -# ç¨ä¾: $(call make_test_each,tests,target) -define make_test_each - $(MAKE) $2 -sC $1; - -endef diff --git a/sample/hoc1/test/Define_group.mk b/sample/hoc1/test/Define_group.mk new file mode 120000 index 0000000..7c7f726 --- /dev/null +++ b/sample/hoc1/test/Define_group.mk @@ -0,0 +1 @@ +/home/kazubito/2010_11/autotest.mk/template/Define_group.mk \ No newline at end of file diff --git a/sample/hoc1/test/Define_test.mk b/sample/hoc1/test/Define_test.mk deleted file mode 100644 index 78394cb..0000000 --- a/sample/hoc1/test/Define_test.mk +++ /dev/null @@ -1,80 +0,0 @@ -###################################################################### -# ãã¯ã -###################################################################### - -# 弿°ã®ãã¡ã¤ã«ããã§ãã¯ããå 容ããªãå ´åã¯åé¤ -# ç¨ä¾: $(call rm_null,file) -define rm_null - if test ! -s $1; then $(RM) $1; fi -endef - -# 説æãã¡ã¤ã«ã®å 容ãã弿°ã®ãã¡ã¤ã«ã«åºå -# ç¨ä¾: $(call desc_log,file_out) -define desc_log - if test -s $(DESC_FILE); then $(CAT) $(DESC_FILE) >>$1; fi -endef - -# ãã¹ãå®è¡ã®çµéæéãããã¡ã¤ã«ã«åºåãã¦è¡¨ç¤º -# 弿°ã¯ããã¹ãåãã³ãã³ããã¡ã¤ã«ãåºåãã¡ã¤ã« -# ç¨ä¾: $(call time_cmd,name,file_cmd,file_out) -define time_cmd - $(call chk_file_notext,$2) - $(CHMOD) u+x $2 - $(TIME) -f"$1: %E" -o $3 ./$2 >$(DEV_NULL) 2>&1 -endef - -# ãã¹ãå®è¡ã³ãã³ãã弿°ã¯ãã³ãã³ããã¡ã¤ã«ãåºåãã¡ã¤ã«ãã¨ã©ã¼ãã¡ã¤ã« -# ã³ãã³ããã¡ã¤ã«ãå®è¡ããæ¨æºåºåãåºåãã¡ã¤ã«ã«ä¿åã -# ã¨ã©ã¼çºçæã¯ãã¨ã©ã¼åºåãåºåãã¡ã¤ã«ã¨ã¨ã©ã¼ãã¡ã¤ã«ã«ä¿åã -# ç¨ä¾: $(call exec_cmd,file_cmd,file_out,file_err) -define exec_cmd - $(call chk_file_notext,$1) - $(CHMOD) u+x $1 - ./$1 >>$2 2>$3 - if test -s $3; then $(CAT) $3 >>$2; fi - $(call rm_null,$3) -endef - -# 2ã¤ã®ãã¡ã¤ã«ãæ¯è¼ããå·®åãã¡ã¤ã«ã使 -# 弿°ã¯ã2ãã¡ã¤ã«ã®ãªã¹ããå·®åãã¡ã¤ã« -# ç¨ä¾: $(call diff_files,files,file_out) -define diff_files - $(DIFF) $1 >$2 2>&1 - $(call rm_null,$2) -endef - -# å·®åãã¡ã¤ã«ã®å 容ããã°ãã¡ã¤ã«ã«åºå -# 弿°ã¯ããã¹ãåãå·®åãã¡ã¤ã«ããã°ãã¡ã¤ã« -# ç¨ä¾: $(call test_log,name,file_diff,file_log) -define test_log - $(call desc_log,$3) - if test ! -s $2; then RES=Success; else RES=Failure; fi; $(ECHO) "$1: Test $$RES $(DATE)" >>$3 - $(ECHO) "Detail in $(CURRDIR)/$(DETAIL_FILE)" >>$3 -endef - -# NODISPãè¨å®ããã¦ããªãæã¯ããã°ãã¡ã¤ã«ã表示 -# 弿°ã¯ããã°ãã¡ã¤ã« -# ç¨ä¾: $(call disp_test_log,file_log) -define disp_test_log - $(if $(NODISP),,$(CAT) $1) -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 - -# ãã¡ã¤ã«åã¨ãã¡ã¤ã«ã®å 容ãåºå -# 弿°ã¯ã対象ãã¡ã¤ã«ãåºåãã¡ã¤ã« -# ç¨ä¾: $(call report_file,file_target,file_out) -define report_file - $(call chk_var_null,$1) - if test -s $1; then $(ECHO) "== $1 ==" >>$2; $(call echo_hr,$2); cat $1 >>$2; $(call echo_hr,$2); $(ECHO) >>$2; fi -endef - -define echo_hr - $(ECHO) "----------------------------------------------------------------------" >>$1 -endef diff --git a/sample/hoc1/test/Define_test.mk b/sample/hoc1/test/Define_test.mk new file mode 120000 index 0000000..3608db5 --- /dev/null +++ b/sample/hoc1/test/Define_test.mk @@ -0,0 +1 @@ +/home/kazubito/2010_11/autotest.mk/template/Define_test.mk \ No newline at end of file diff --git a/sample/hoc1/test/Makefile b/sample/hoc1/test/Makefile deleted file mode 100644 index 2160a36..0000000 --- a/sample/hoc1/test/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# autotest.mk > test_template > Makefile -# ãã¹ãã°ã«ã¼ã使ã®Makefile -# -# ãªãã¬ã¼ã¿ã¼ -# make : ãã¹ãã°ã«ã¼ããã£ã¬ã¯ããªã¼ã使ããMakefile群ãã³ãã¼ -# make creategroup : â -# make creategroupdir: ãã¹ãã°ã«ã¼ããã£ã¬ã¯ããªã¼ã使 -# make copymakefile : Makefile群ãã³ãã¼ - -# 夿°ããã¯ãã®å®ç¾© -include Define.mk - -# ãã¹ãã°ã«ã¼ãã®Makefileã¨ãã¦ã³ãã¼ããããã¡ã¤ã« -GROUP_MAKEFILE := Group.mk - -.PHONY: creategroup creategroupdir copymakefiles - -creategroup: creategroupdir copymakefiles - -creategroupdir: - @$(call err_var_null,GROUPDIR) - @$(call err_file_ext,GROUPDIR) - @$(MKDIR) $(GROUPDIR) - -copymakefiles: - @$(CP) $(GROUP_MAKEFILE) $(GROUPDIR)/Makefile - @$(CP) $(MAKEFILES) $(GROUPDIR)/ diff --git a/sample/hoc1/test/Makefile b/sample/hoc1/test/Makefile new file mode 120000 index 0000000..96aa0a7 --- /dev/null +++ b/sample/hoc1/test/Makefile @@ -0,0 +1 @@ +/home/kazubito/2010_11/autotest.mk/template/Group.mk \ No newline at end of file diff --git a/sample/hoc1/test/Test.mk b/sample/hoc1/test/Test.mk deleted file mode 100644 index edfa278..0000000 --- a/sample/hoc1/test/Test.mk +++ /dev/null @@ -1,65 +0,0 @@ -# autotest.mk > test_template > Test.mk -# èªåãã¹ãç¨ã®Makefile -# -# è¦: Define.mk Define_test.mk -# -# ãªãã¬ã¼ã¿ã¼ -# make : CMDã®æ¨æºåºåãTEST1_FILEã«ä¿åãããã¨ãTEST0_FILEã¨ã®å·®åãæ¯è¼ããçµæãLOG_FILEã«åºå -# make check : â -# make set : CMDã®æ¨æºåºåãTEST0_FILEã«ä¿åãTEST0_FILEãåå¨ããå ´åã¯å®è¡ããªã -# make reset : CMDã®æ¨æºåºåãTEST0_FILEã«ä¿åãTEST0_FILEãåå¨ããå ´åã¯ä¸æ¸ã -# make time : CMDã®å®è¡ã«ããã£ãæéãTIME_FILEã«ä¿åããåºå -# make cleantime: "make time" ã§ä½æããããã¡ã¤ã«ãã¯ãªã¢ -# make clean : "make" ã§ä½æããããã¡ã¤ã«ãã¯ãªã¢ -# make cleanall: "make" 㨠"make set" ã§ä½æããããã¡ã¤ã«ãã¯ãªã¢ - -SHELL = /bin/sh - -# ãã¹ãåãã«ã¬ã³ããã£ã¬ã¯ããªã¼åããåå¾ -TEST = $(notdir $(CURRDIR)) - -.PHONY: check set reset time cleantime clean cleanall - -check: clean $(DETAIL_FILE) - @$(call disp_test_log,$(LOG_FILE)) - -checkall: check $(TIME_FILE) - @$(CAT) $(TIME_FILE) >>$(LOG_FILE) - @$(call disp_test_log,$(LOG_FILE)) - -set: $(TEST0_FILE) - @$(CAT) $^ - -reset: cleanall $(TEST0_FILE) - @$(CAT) $(TEST0_FILE) - -time: cleantime $(TIME_FILE) - -cleantime: - @$(RM) $(TIME_FILE) - -clean: - @$(RM) $(TEST_RES_FILES) - -cleanall: clean - @$(RM) $(TEST0_FILE) - -$(CMD_FILE): - @$(call chk_file_notext,$@) - @$(CHMOD) u+x $@ - -$(TEST0_FILE) $(TEST1_FILE): $(CMD_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 report_files,$(LOG_FILE) $(CMD_FILE) $(TEST0_FILE) $(ERR_FILE) $(DIFF_FILE) $(TEST1_FILE),$@) - -$(TIME_FILE): $(CMD_FILE) - @-$(call time_cmd,$(TEST),$^,$@) diff --git a/sample/hoc1/test/Test.mk b/sample/hoc1/test/Test.mk new file mode 120000 index 0000000..0b8d2f2 --- /dev/null +++ b/sample/hoc1/test/Test.mk @@ -0,0 +1 @@ +/home/kazubito/2010_11/autotest.mk/template/Test.mk \ No newline at end of file diff --git a/selftest/unittest/Define.mk b/selftest/unittest/Define.mk deleted file mode 100644 index 18813ff..0000000 --- a/selftest/unittest/Define.mk +++ /dev/null @@ -1,125 +0,0 @@ -# autotest.mk > test_template > Define.mk -# èªåãã¹ãç¨ã®å¤æ°ããã¯ãå®ç¾© - -ifndef DEFINE_INCLUDED -DEFINE_INCLUDED = 1 - -# ç¾å¨ã®æ¥æ -DATE = $(shell date +"%F %T") - -# ç¾å¨ã®ãã£ã¬ã¯ããªã¼ -CURRDIR = $(shell pwd) - -# Makefile -MAKEFILE := Makefile - -###################################################################### -# ã³ãã³ã -###################################################################### - -CP ?= cp - -CAT ?= cat - -MKDIR ?= mkdir - -RM ?= rm -f - -ECHO ?= echo - -TIME ?= /usr/bin/time --quiet - -DIFF ?= diff -c - -DEV_NULL ?= /dev/null - -CHMOD ?= chmod - -GREP ?= grep - -LINECOUNT ?= wc -l - -FIND ?= find - -TR ?= tr - -EXPR ?= expr -###################################################################### -# ãã¹ãã°ã«ã¼ãã¨ãã¹ãã§ã®å ±éãã¯ã -###################################################################### - -# chk_var_null: 弿°ãNULLã®å ´åãã¨ã©ã¼ -# ç¨ä¾: $(call chk_var_null,var) -define chk_var_null - $(if $1,,$(error NULL argument)) -endef - -# chk_file_ext: æå®ããããã¡ã¤ã«ãå®å¨ããå ´åãã¨ã©ã¼ -# ç¨ä¾: $(call chk_file_ext,file) -define chk_file_ext - $(if $(wildcard $1),$(error $1 exists in $(CURRDIR))) -endef - -# chk_file_notext: æå®ããããã¡ã¤ã«ãå®å¨ããªãå ´åãã¨ã©ã¼ -# ç¨ä¾: $(call chk_file_notext,file) -define chk_file_notext - $(if $(wildcard $1),,$(error $1 not exists in $(CURRDIR))) -endef - -###################################################################### -# ãã¹ãã°ã«ã¼ãã®ãã£ã¬ã¯ããªã¼ -###################################################################### - -# ãã¹ãã°ã«ã¼ãã¨ãã¹ãã®å¤æ°ãå®ç¾©ããMakefile -DEF_FILE := Define.mk - -# ãã¹ãã°ã«ã¼ãã®å¤æ°ãå®ç¾©ããMakefile -DEF_GROUP_FILE := Define_group.mk - -# ãã¹ãã®å¤æ°ãå®ç¾©ããMakefile -DEF_TEST_FILE := Define_test.mk - -# ãã¹ãã®ã¿ã¼ã²ãããå®ç¾©ããMakefile -TEST_MAKEFILE := Test.mk - -# ãã¹ã¦ã®Makefile群 -MAKEFILES := $(DEF_FILE) $(DEF_GROUP_FILE) $(DEF_TEST_FILE) $(TEST_MAKEFILE) - -# ãã¹ããã¨ã®Makefileã§ã¤ã³ã¯ã«ã¼ãããMakefile群 -TEST_MAKEFILES := $(DEF_FILE) $(DEF_TEST_FILE) $(TEST_MAKEFILE) - -###################################################################### -# ãã¹ãã®ãã£ã¬ã¯ããªã¼ -###################################################################### - -# ãã¹ãã³ãã³ããã¡ã¤ã« -CMD_FILE := cmd - -# ãã¹ã説æãã¡ã¤ã« -DESC_FILE := desc.txt - -# ãã¹ãæ³å®çµæãã¡ã¤ã« -TEST0_FILE := 0.txt - -# ãã¹ãçµæãã¡ã¤ã« -TEST1_FILE := 1.txt - -# ãã¹ãã®ãæ³å®çµæã¨çµæã®å·®åãã¡ã¤ã« -DIFF_FILE := diff.txt - -# ãã¹ãã¨ã©ã¼ãã¡ã¤ã« -ERR_FILE := err.txt - -# ãã¹ããã°ãã¡ã¤ã« -LOG_FILE := test.log - -# å®è¡æéãã¡ã¤ã« -TIME_FILE := time.log - -# ãã¹ã詳細ã¬ãã¼ããã¡ã¤ã« -DETAIL_FILE := detail.log - -# ãã¹ãã®çµæã¨ãã¦ä½æããããã¡ã¤ã«ç¾¤ -TEST_RES_FILES := $(TEST1_FILE) $(DIFF_FILE) $(ERR_FILE) $(LOG_FILE) $(DETAIL_FILE) $(TIME_FILE) - -endif diff --git a/selftest/unittest/Define.mk b/selftest/unittest/Define.mk new file mode 120000 index 0000000..23af1e7 --- /dev/null +++ b/selftest/unittest/Define.mk @@ -0,0 +1 @@ +/home/kazubito/2010_11/autotest.mk/template/Define.mk \ No newline at end of file diff --git a/selftest/unittest/Define_group.mk b/selftest/unittest/Define_group.mk deleted file mode 100644 index f3cda2c..0000000 --- a/selftest/unittest/Define_group.mk +++ /dev/null @@ -1,95 +0,0 @@ -###################################################################### -# ãã¹ãã°ã«ã¼ãã®ãã£ã¬ã¯ããªã¼ -# ã»ãã«ãDefine.mkã§ãä¸é¨å®ç¾© -###################################################################### - -# ã°ã«ã¼ããã£ã¬ã¯ããªã¼ -GROUP_DIR := $(CURRDIR) - -# ã°ã«ã¼ãåããã£ã¬ã¯ããªåããåå¾ -GROUP := $(notdir $(GROUP_DIR)) - -# ãã¹ãåãã«ã¬ã³ããã£ã¬ã¯ããªã¼å ã®ãååã大æåã¾ãã¯.以å¤ã§å§ã¾ããã£ã¬ã¯ããªã¼ -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_TIME_FILE := $(shell echo $(GROUP) | $(TR) '[a-z]' '[A-Z]')_time.log - -# ã°ã«ã¼ãã§ããã¹ãçµæã¨ãã¦ä½æããããã¡ã¤ã«ç¾¤ -GROUP_RES_FILES := $(GROUP_LOG_FILE) $(GROUP_REPORT_FILE) $(GROUP_TIME_FILE) - -# ãã¹ããã¨ã®ãã°ãã¡ã¤ã« -TEST_LOG_FILES := $(foreach test,$(TESTS),$(test)/$(LOG_FILE)) - -###################################################################### -# ãã¹ãã°ã«ã¼ãã®ãã¯ã -###################################################################### - -# æå®ãããã£ã¬ã¯ããªã¼ã使 -# ç¨ä¾: $(call create_dir,name) -define create_dir - $(call chk_var_null,$1) - $(call chk_file_ext,$1) - $(MKDIR) $1 -endef - -# ãªã¹ãã§æå®ããã親ãã£ã¬ã¯ããªã¼ã«ããMakefileãã¤ã³ã¯ã«ã¼ãããMakefileã使 -# ç¨ä¾: $(call create_makefile,file,list_include_file) -define create_makefile - $(RM) $1 - $(foreach infile,$2,$(ECHO) "include ../$(infile)" >>$1; ) -endef - -# ãã¹ããã¨ã®ãã¡ã¤ã«ãã°ã«ã¼ããã¡ã¤ã«ã«åºå -# 弿°ã¯ããã¹ãã®ãªã¹ããã°ã«ã¼ããã¡ã¤ã«ããã¹ããã¡ã¤ã« -# ç¨ä¾: $(call group_log,files_test_log,file_group_log) -define group_log - $(foreach target,$1,$(call group_log_each,$(target),$2)) -endef - -# ãã¹ãã®ãã°ãã¡ã¤ã«ãã°ã«ã¼ããã°ãã¡ã¤ã«ã«åºåã弿°ã¯ããã¹ããã°ã«ã¼ããã°ãã¡ã¤ã« -# ç¨ä¾: $(call group_log_each,file_test_log,file_group_log) -define group_log_each - if test -s $1; then $(CAT) $1 >>$2; else $(ECHO) $(dir $1)": no log" >>$2; fi - $(ECHO) >>$2; - -endef - -# æåãããã¹ãã®æ°ããã¹ãã°ã«ã¼ããã°ãã¡ã¤ã«ããåå¾ -SUCCESS_TEST = $(shell $(GREP) "^[^A-Z.].*: Test Success" $(GROUP_LOG_FILE) | $(LINECOUNT)) - -# 失æãããã¹ãã®æ°ããã¹ãã°ã«ã¼ããã°ãã¡ã¤ã«ããåå¾ -FAIL_TEST = $(shell $(GREP) "^[^A-Z.].*: Test Failure" $(GROUP_LOG_FILE) | $(LINECOUNT)) - -# ãã¹ã¦ã®ãã¹ãã®æ° -ALL_TEST = $(shell $(EXPR) $(SUCCESS_TEST) + $(FAIL_TEST)) - -# ãã¹ããã¨ã®å®è¡æéãã¡ã¤ã« -TEST_TIME_FILES := $(foreach test,$(TESTS),$(test)/$(TIME_FILE)) - -# ãã¹ãã®çµæããã°ã«ã¼ããã°ãã¡ã¤ã«ãå ã«ã¬ãã¼ãã -# 弿°ã¯ãã°ã«ã¼ãåãã°ã«ã¼ããã°ãã¡ã¤ã«ãã°ã«ã¼ãã¬ãã¼ããã¡ã¤ã« -# ç¨ä¾: $(call group_report,name,file_log,file_report) -define group_report - $(ECHO) "$1: $(SUCCESS_TEST) / $(ALL_TEST) tests passed. Detail in $(GROUP_DIR)/$2" >$3; - if test $(FAIL_TEST) -eq 0; then $(ECHO) "$1: All tests are succeded." >>$3; fi -endef - -# ãªã¹ãã§æå®ãããã£ã¬ã¯ããªã¼ã§makeãå®è¡ -# ç¨ä¾: $(call make_tests,list_dir,target) -define make_tests - $(foreach dir,$1,$(call make_test_each,$(dir),$2)) -endef - -# æå®ãããã£ã¬ã¯ããªã¼ã§makeãå®è¡ -# ç¨ä¾: $(call make_test_each,tests,target) -define make_test_each - $(MAKE) $2 -sC $1; - -endef diff --git a/selftest/unittest/Define_group.mk b/selftest/unittest/Define_group.mk new file mode 120000 index 0000000..7c7f726 --- /dev/null +++ b/selftest/unittest/Define_group.mk @@ -0,0 +1 @@ +/home/kazubito/2010_11/autotest.mk/template/Define_group.mk \ No newline at end of file diff --git a/selftest/unittest/Define_test.mk b/selftest/unittest/Define_test.mk deleted file mode 100644 index 78394cb..0000000 --- a/selftest/unittest/Define_test.mk +++ /dev/null @@ -1,80 +0,0 @@ -###################################################################### -# ãã¯ã -###################################################################### - -# 弿°ã®ãã¡ã¤ã«ããã§ãã¯ããå 容ããªãå ´åã¯åé¤ -# ç¨ä¾: $(call rm_null,file) -define rm_null - if test ! -s $1; then $(RM) $1; fi -endef - -# 説æãã¡ã¤ã«ã®å 容ãã弿°ã®ãã¡ã¤ã«ã«åºå -# ç¨ä¾: $(call desc_log,file_out) -define desc_log - if test -s $(DESC_FILE); then $(CAT) $(DESC_FILE) >>$1; fi -endef - -# ãã¹ãå®è¡ã®çµéæéãããã¡ã¤ã«ã«åºåãã¦è¡¨ç¤º -# 弿°ã¯ããã¹ãåãã³ãã³ããã¡ã¤ã«ãåºåãã¡ã¤ã« -# ç¨ä¾: $(call time_cmd,name,file_cmd,file_out) -define time_cmd - $(call chk_file_notext,$2) - $(CHMOD) u+x $2 - $(TIME) -f"$1: %E" -o $3 ./$2 >$(DEV_NULL) 2>&1 -endef - -# ãã¹ãå®è¡ã³ãã³ãã弿°ã¯ãã³ãã³ããã¡ã¤ã«ãåºåãã¡ã¤ã«ãã¨ã©ã¼ãã¡ã¤ã« -# ã³ãã³ããã¡ã¤ã«ãå®è¡ããæ¨æºåºåãåºåãã¡ã¤ã«ã«ä¿åã -# ã¨ã©ã¼çºçæã¯ãã¨ã©ã¼åºåãåºåãã¡ã¤ã«ã¨ã¨ã©ã¼ãã¡ã¤ã«ã«ä¿åã -# ç¨ä¾: $(call exec_cmd,file_cmd,file_out,file_err) -define exec_cmd - $(call chk_file_notext,$1) - $(CHMOD) u+x $1 - ./$1 >>$2 2>$3 - if test -s $3; then $(CAT) $3 >>$2; fi - $(call rm_null,$3) -endef - -# 2ã¤ã®ãã¡ã¤ã«ãæ¯è¼ããå·®åãã¡ã¤ã«ã使 -# 弿°ã¯ã2ãã¡ã¤ã«ã®ãªã¹ããå·®åãã¡ã¤ã« -# ç¨ä¾: $(call diff_files,files,file_out) -define diff_files - $(DIFF) $1 >$2 2>&1 - $(call rm_null,$2) -endef - -# å·®åãã¡ã¤ã«ã®å 容ããã°ãã¡ã¤ã«ã«åºå -# 弿°ã¯ããã¹ãåãå·®åãã¡ã¤ã«ããã°ãã¡ã¤ã« -# ç¨ä¾: $(call test_log,name,file_diff,file_log) -define test_log - $(call desc_log,$3) - if test ! -s $2; then RES=Success; else RES=Failure; fi; $(ECHO) "$1: Test $$RES $(DATE)" >>$3 - $(ECHO) "Detail in $(CURRDIR)/$(DETAIL_FILE)" >>$3 -endef - -# NODISPãè¨å®ããã¦ããªãæã¯ããã°ãã¡ã¤ã«ã表示 -# 弿°ã¯ããã°ãã¡ã¤ã« -# ç¨ä¾: $(call disp_test_log,file_log) -define disp_test_log - $(if $(NODISP),,$(CAT) $1) -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 - -# ãã¡ã¤ã«åã¨ãã¡ã¤ã«ã®å 容ãåºå -# 弿°ã¯ã対象ãã¡ã¤ã«ãåºåãã¡ã¤ã« -# ç¨ä¾: $(call report_file,file_target,file_out) -define report_file - $(call chk_var_null,$1) - if test -s $1; then $(ECHO) "== $1 ==" >>$2; $(call echo_hr,$2); cat $1 >>$2; $(call echo_hr,$2); $(ECHO) >>$2; fi -endef - -define echo_hr - $(ECHO) "----------------------------------------------------------------------" >>$1 -endef diff --git a/selftest/unittest/Define_test.mk b/selftest/unittest/Define_test.mk new file mode 120000 index 0000000..3608db5 --- /dev/null +++ b/selftest/unittest/Define_test.mk @@ -0,0 +1 @@ +/home/kazubito/2010_11/autotest.mk/template/Define_test.mk \ No newline at end of file diff --git a/selftest/unittest/Makefile b/selftest/unittest/Makefile deleted file mode 100644 index e22d03c..0000000 --- a/selftest/unittest/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# autotest.mk > template > Group.mk -# ãã¹ãã°ã«ã¼ãã®Makefile -# -# ãªãã¬ã¼ã¿ã¼ -# make : ãã¹ã¦ã®ãã¹ãã宿½ãããã°ãã¡ã¤ã«ã使 -# make check : â -# make create : TESTNAMEã§æå®ããããã¹ããæ°è¦ã«ä½æ -# make set : ãã¹ã¦ã®ãã¹ãã®ãæ³å®çµæãåºå -# make checkeach: ãã¹ã¦ã®ãã¹ãã宿½ -# make report : ãã°ãã¡ã¤ã«ããããã¹ãã®çµæãã¬ãã¼ã -# make clean : ãã¹ã¦ã®ãã¹ãã§ã"make" ã§çæããããã¡ã¤ã«ãã¯ãªã¢ -# make cleanall: ãã¹ã¦ã®ãã¹ãã§ã"make" 㨠"make set" ã§çæããããã¡ã¤ã«ãã¯ãªã¢ - -SHELL = /bin/sh - -include Define.mk -include Define_group.mk - -.PHONY: check checkall time create clean cleantime - -check checkall: clean $(GROUP_REPORT_FILE) - @$(CAT) $(GROUP_REPORT_FILE) - -time: cleantime $(GROUP_TIME_FILE) - @$(CAT) $(GROUP_TIME_FILE) - -create: - @$(call create_dir,$(TEST)) - @$(call create_makefile,$(TEST)/$(MAKEFILE),$(TEST_MAKEFILES)) - -clean: - @$(call make_tests,$(TESTS),$@) - @$(RM) $(GROUP_RES_FILES) - -cleantime: - @$(call make_tests,$(TESTS),$@) - @$(RM) $(GROUP_TIME_FILE) - -$(GROUP_REPORT_FILE): $(GROUP_LOG_FILE) - @$(call group_report,$(GROUP),$^,$@) - -$(GROUP_LOG_FILE): $(TEST_LOG_FILES) - @$(call group_log,$^,$@) - -$(TEST_LOG_FILES): - @$(MAKE) $(MAKECMDGOALS) -sC $(dir $@) NODISP=1 - -$(GROUP_TIME_FILE): $(TEST_TIME_FILES) - @$(call group_log,$^,$@) - -$(TEST_TIME_FILES): - @$(MAKE) time -sC $(dir $@) diff --git a/selftest/unittest/Makefile b/selftest/unittest/Makefile new file mode 120000 index 0000000..96aa0a7 --- /dev/null +++ b/selftest/unittest/Makefile @@ -0,0 +1 @@ +/home/kazubito/2010_11/autotest.mk/template/Group.mk \ No newline at end of file diff --git a/selftest/unittest/Test.mk b/selftest/unittest/Test.mk deleted file mode 100644 index edfa278..0000000 --- a/selftest/unittest/Test.mk +++ /dev/null @@ -1,65 +0,0 @@ -# autotest.mk > test_template > Test.mk -# èªåãã¹ãç¨ã®Makefile -# -# è¦: Define.mk Define_test.mk -# -# ãªãã¬ã¼ã¿ã¼ -# make : CMDã®æ¨æºåºåãTEST1_FILEã«ä¿åãããã¨ãTEST0_FILEã¨ã®å·®åãæ¯è¼ããçµæãLOG_FILEã«åºå -# make check : â -# make set : CMDã®æ¨æºåºåãTEST0_FILEã«ä¿åãTEST0_FILEãåå¨ããå ´åã¯å®è¡ããªã -# make reset : CMDã®æ¨æºåºåãTEST0_FILEã«ä¿åãTEST0_FILEãåå¨ããå ´åã¯ä¸æ¸ã -# make time : CMDã®å®è¡ã«ããã£ãæéãTIME_FILEã«ä¿åããåºå -# make cleantime: "make time" ã§ä½æããããã¡ã¤ã«ãã¯ãªã¢ -# make clean : "make" ã§ä½æããããã¡ã¤ã«ãã¯ãªã¢ -# make cleanall: "make" 㨠"make set" ã§ä½æããããã¡ã¤ã«ãã¯ãªã¢ - -SHELL = /bin/sh - -# ãã¹ãåãã«ã¬ã³ããã£ã¬ã¯ããªã¼åããåå¾ -TEST = $(notdir $(CURRDIR)) - -.PHONY: check set reset time cleantime clean cleanall - -check: clean $(DETAIL_FILE) - @$(call disp_test_log,$(LOG_FILE)) - -checkall: check $(TIME_FILE) - @$(CAT) $(TIME_FILE) >>$(LOG_FILE) - @$(call disp_test_log,$(LOG_FILE)) - -set: $(TEST0_FILE) - @$(CAT) $^ - -reset: cleanall $(TEST0_FILE) - @$(CAT) $(TEST0_FILE) - -time: cleantime $(TIME_FILE) - -cleantime: - @$(RM) $(TIME_FILE) - -clean: - @$(RM) $(TEST_RES_FILES) - -cleanall: clean - @$(RM) $(TEST0_FILE) - -$(CMD_FILE): - @$(call chk_file_notext,$@) - @$(CHMOD) u+x $@ - -$(TEST0_FILE) $(TEST1_FILE): $(CMD_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 report_files,$(LOG_FILE) $(CMD_FILE) $(TEST0_FILE) $(ERR_FILE) $(DIFF_FILE) $(TEST1_FILE),$@) - -$(TIME_FILE): $(CMD_FILE) - @-$(call time_cmd,$(TEST),$^,$@) diff --git a/selftest/unittest/Test.mk b/selftest/unittest/Test.mk new file mode 120000 index 0000000..0b8d2f2 --- /dev/null +++ b/selftest/unittest/Test.mk @@ -0,0 +1 @@ +/home/kazubito/2010_11/autotest.mk/template/Test.mk \ No newline at end of file diff --git a/selftest/unittest/makefiles_abs/0.txt b/selftest/unittest/makefiles_abs/0.txt new file mode 100644 index 0000000..7eb4820 --- /dev/null +++ b/selftest/unittest/makefiles_abs/0.txt @@ -0,0 +1 @@ +/home/kazubito/2010_11/autotest.mk/selftest/unittest/makefiles_abs/Define.mk /home/kazubito/2010_11/autotest.mk/selftest/unittest/makefiles_abs/Define_group.mk /home/kazubito/2010_11/autotest.mk/selftest/unittest/makefiles_abs/Define_test.mk /home/kazubito/2010_11/autotest.mk/selftest/unittest/makefiles_abs/Test.mk diff --git a/selftest/unittest/makefiles_abs/Makefile b/selftest/unittest/makefiles_abs/Makefile new file mode 100644 index 0000000..4c5d509 --- /dev/null +++ b/selftest/unittest/makefiles_abs/Makefile @@ -0,0 +1,6 @@ +include ../Define.mk +include ../Define_test.mk +include ../Test.mk + +utest: + $(ECHO) $(MAKEFILES_ABS) diff --git a/selftest/unittest/makefiles_abs/cmd b/selftest/unittest/makefiles_abs/cmd new file mode 100755 index 0000000..cc66599 --- /dev/null +++ b/selftest/unittest/makefiles_abs/cmd @@ -0,0 +1 @@ +make -s utest diff --git a/template/Define.mk b/template/Define.mk index 18813ff..efc1aeb 100644 --- a/template/Define.mk +++ b/template/Define.mk @@ -44,6 +44,9 @@ FIND ?= find TR ?= tr EXPR ?= expr + +LINK ?= ln -s + ###################################################################### # ãã¹ãã°ã«ã¼ãã¨ãã¹ãã§ã®å ±éãã¯ã ###################################################################### @@ -85,6 +88,8 @@ TEST_MAKEFILE := Test.mk # ãã¹ã¦ã®Makefile群 MAKEFILES := $(DEF_FILE) $(DEF_GROUP_FILE) $(DEF_TEST_FILE) $(TEST_MAKEFILE) +MAKEFILES_ABS := $(foreach file,$(MAKEFILES),$(CURRDIR)/$(file)) + # ãã¹ããã¨ã®Makefileã§ã¤ã³ã¯ã«ã¼ãããMakefile群 TEST_MAKEFILES := $(DEF_FILE) $(DEF_TEST_FILE) $(TEST_MAKEFILE) diff --git a/template/Makefile b/template/Makefile index 2160a36..5f43798 100644 --- a/template/Makefile +++ b/template/Makefile @@ -13,15 +13,21 @@ include Define.mk # ãã¹ãã°ã«ã¼ãã®Makefileã¨ãã¦ã³ãã¼ããããã¡ã¤ã« GROUP_MAKEFILE := Group.mk -.PHONY: creategroup creategroupdir copymakefiles +.PHONY: creategroup creategroupdir copymakefiles linkmakefiles -creategroup: creategroupdir copymakefiles +MKFILE_METHOD = $(if $(LINK),linkmk,copymk) + +creategroup: creategroupdir $(MKFILE_METHOD) creategroupdir: @$(call err_var_null,GROUPDIR) @$(call err_file_ext,GROUPDIR) @$(MKDIR) $(GROUPDIR) -copymakefiles: +copymk: @$(CP) $(GROUP_MAKEFILE) $(GROUPDIR)/Makefile @$(CP) $(MAKEFILES) $(GROUPDIR)/ + +linkmk: + @$(LINK) $(CURRDIR)/$(GROUP_MAKEFILE) $(GROUPDIR)/Makefile + @$(LINK) $(MAKEFILES_ABS) $(GROUPDIR)/