システムテストの修正

diff --git a/test/system/casl2/Define.mk b/test/system/casl2/Define.mk
index 92e3b8e..ff5b4b0 100644 (file)
--- a/test/system/casl2/Define.mk
+++ b/test/system/casl2/Define.mk
@@ -47,6 +47,8 @@ EXPR ?= expr
 
 LN ?= ln -s
 
+SED ?= sed
+
 ######################################################################
 # テストグループとテストでの共通マクロ
 ######################################################################
@@ -63,31 +65,57 @@ define chk_file_ext
     $(if $(wildcard $1),$(error $1 exists in $(CURRDIR)))
 endef
 
+# 指定したディレクトリーを作成
+# 引数は、ディレクトリー名
+# 用例: $(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; )
+    $(if $(filter $(SRC),c),$(call puts_cmd_c,$1))
+endef
+
+# C言語の関数をテストするための設定を、指定されたファイルに出力
+# 引数は、ファイル名
+# 用例: $(call puts_cmd_c,file)
+define puts_cmd_c
+    $(ECHO) >>$1
+    $(ECHO) "CC := gcc" >>$1
+    $(ECHO) "CFLAGS := -Wall" >>$1
+    $(ECHO) >>$1
+    $(ECHO) ".INTERMEDIATE:" "$$""(CMD_FILE)" >>$1
+    $(ECHO) >>$1
+    $(ECHO) "CMDSRC_FILE := cmd.c" >>$1
+    $(ECHO) "TESTTARGET_FILES :=       # Set test target files" >>$1
+    $(ECHO) >>$1
+    $(ECHO) "$$""(CMD_FILE):" "$$""(CMDSRC_FILE)" "$$""(TESTTARGET_FILES)" >>$1
+    $(ECHO) "  ""$$""(CC)" "$$""(CFLAGS)" "-o" "$$""@" "$$""^" >>$1
+endef
+
 ######################################################################
 # テストグループのディレクトリー
 ######################################################################
 
 # テストグループとテストの変数を定義したMakefile
-DEF_FILE := Define.mk
-
-# テストグループの変数を定義したMakefile
-DEF_GROUP_FILE := Define_group.mk
-
-# テストの変数を定義したMakefile
-DEF_TEST_FILE := Define_test.mk
+DEFINE_FILE := Define.mk
 
 # テストのターゲットを定義したMakefile
 TEST_MAKEFILE := Test.mk
 
 # すべてのMakefile群
-MAKEFILES := $(DEF_FILE) $(DEF_GROUP_FILE) $(DEF_TEST_FILE) $(TEST_MAKEFILE)
+MAKEFILES := $(DEFINE_FILE) $(TEST_MAKEFILE)
 
 # すべてのMakefile群の絶対パス
 MAKEFILES_ABS := $(foreach file,$(MAKEFILES),$(CURRDIR)/$(file))
 
-# テストごとのMakefileでインクルードするMakefile群
-TEST_MAKEFILES := $(DEF_FILE) $(DEF_TEST_FILE) $(TEST_MAKEFILE)
-
 ######################################################################
 # テストのディレクトリー
 ######################################################################
@@ -98,20 +126,20 @@ CMD_FILE := cmd
 # テスト説明ファイル
 DESC_FILE := desc.txt
 
-# テスト想定結果ファイル
+# テスト想定ファイル
 TEST0_FILE := 0.txt
 
 # テスト結果ファイル
 TEST1_FILE := 1.txt
 
 # テストの、想定結果と結果の差分ファイル
-DIFF_FILE := diff.txt
+DIFF_FILE := diff.log
 
 # テストエラーファイル
-ERR_FILE := err.txt
+ERR_FILE := err.log
 
 # テストログファイル
-LOG_FILE := test.log
+LOG_FILE := summary.log
 
 # 実行時間ファイル
 TIME_FILE := time.log

diff --git a/test/system/casl2/Define_group.mk b/test/system/casl2/Define_group.mk
deleted file mode 100644 (file)
index a572469..0000000
--- a/test/system/casl2/Define_group.mk
+++ /dev/null
@@ -1,96 +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
-    $(ECHO) $(dir $1) >>$2;
-    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/test/system/casl2/Define_test.mk b/test/system/casl2/Define_test.mk
deleted file mode 100644 (file)
index c3508ca..0000000
--- a/test/system/casl2/Define_test.mk
+++ /dev/null
@@ -1,77 +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,file_cmd,file_out)
-define time_cmd
-    if test ! -x $1; then $(CHMOD) u+x $1; fi
-    ($(TIME) ./$1 1>$(DEV_NULL) 2>$(DEV_NULL)) 2>&1 | $(GREP) '^real' >$2
-endef
-
-# テスト実行コマンド。引数は、コマンドファイル、出力ファイル、エラーファイル
-# コマンドファイルを実行し、標準出力を出力ファイルに保存。
-# エラー発生時は、エラー出力を出力ファイルとエラーファイルに保存。
-# 用例: $(call exec_cmd,file_cmd,file_out,file_err)
-define exec_cmd
-    if test ! -x $1; then $(CHMOD) u+x $1; fi
-    ./$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
-    $(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/test/system/casl2/Makefile b/test/system/casl2/Makefile
index 21aec37..01d5a27 100644 (file)
--- a/test/system/casl2/Makefile
+++ b/test/system/casl2/Makefile
@@ -13,7 +13,87 @@
 SHELL = /bin/sh
 
 include Define.mk
-include Define_group.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 := Summary.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 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
+    $(ECHO) $(dir $1) >>$2;
+    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. Details 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
 
 .PHONY: check checkall time create clean cleantime
 
@@ -25,7 +105,7 @@ time: cleantime $(GROUP_TIME_FILE)
 
 create:
        @$(call create_dir,$(TEST))
-       @$(call create_makefile,$(TEST)/$(MAKEFILE),$(TEST_MAKEFILES))
+       @$(call create_makefile,$(TEST)/$(MAKEFILE),$(MAKEFILES))
 
 clean:
        @$(call make_tests,$(TESTS),$@)
@@ -42,7 +122,7 @@ $(GROUP_LOG_FILE): $(TEST_LOG_FILES)
        @$(call group_log,$^,$@)
 
 $(TEST_LOG_FILES):
-       @$(MAKE) $(MAKECMDGOALS) -C $(dir $@) NODISP=1
+       @$(MAKE) $(MAKECMDGOALS) -sC $(dir $@) NODISP=1
 
 $(GROUP_TIME_FILE): $(TEST_TIME_FILES)
        @$(call group_log,$^,$@)

diff --git a/test/system/casl2/Test.mk b/test/system/casl2/Test.mk
index 216986e..11d4065 100644 (file)
--- a/test/system/casl2/Test.mk
+++ b/test/system/casl2/Test.mk
@@ -12,16 +12,97 @@
 # make cleantime: "make time" で作成されたファイルをクリア
 # make clean   : "make" で作成されたファイルをクリア
 # make cleanall: "make" と "make set" で作成されたファイルをクリア
-
 SHELL = /bin/bash
 
+######################################################################
+# マクロ
+######################################################################
+
+# 指定されたファイルをチェックし、空の場合は削除
+# 引数は、対象ファイル
+# 用例: $(call rm_null,file_target)
+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,file_cmd,file_out)
+define time_cmd
+    if test ! -x $1; then $(CHMOD) u+x $1; fi
+    ($(TIME) ./$1 1>$(DEV_NULL) 2>$(DEV_NULL)) 2>&1 | $(GREP) '^real' >$2
+endef
+
+# テスト実行コマンド。
+# コマンドファイルを実行し、標準出力を指定されたファイルに保存。
+# エラー発生時は、エラー出力を出力ファイルとエラーファイルに保存。
+# 引数は、コマンドファイル、出力ファイル、エラーファイル
+# 用例: $(call exec_cmd,file_cmd,file_out,file_err)
+define exec_cmd
+    if test ! -x $1; then $(CHMOD) u+x $1; fi
+    ./$1 >>$2 2>$3
+    if test -s $3; then $(CAT) $3 >>$2; fi
+    $(SED) -i '' -e "s%$(CURRDIR)%\$$PWD%g" $2
+    $(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) "Details 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
+    $(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
+
 # テスト名。カレントディレクトリー名から取得
 TEST = $(notdir $(CURRDIR))
 
 # コマンドファイルのソース
 CMDSRC_FILE ?= $(CMD_FILE)
 
-.PHONY: check set reset time cleantime clean cleanall
+.PHONY: check set reset clean cleanall time cleantime
 
 check: clean $(DETAIL_FILE)
        @$(call disp_test_log,$(LOG_FILE))
@@ -30,16 +111,14 @@ checkall: clean $(DETAIL_FILE) $(TIME_FILE)
        @$(CAT) $(TIME_FILE) >>$(LOG_FILE)
        @$(call disp_test_log,$(LOG_FILE))
 
-set:
+set: $(CMD_FILE)
+       @$(call chk_file_ext,$(TEST0_FILE))
        @-$(call exec_cmd,$(CMD_FILE),$(TEST0_FILE),$(ERR_FILE))
        @$(CAT) $(TEST0_FILE)
 
-reset: cleanall set
-
-time: cleantime $(TIME_FILE)
-
-cleantime:
-       @$(RM) $(TIME_FILE)
+reset: cleanall $(CMD_FILE)
+       @-$(call exec_cmd,$(CMD_FILE),$(TEST0_FILE),$(ERR_FILE))
+       @$(CAT) $(TEST0_FILE)
 
 clean:
        @$(RM) $(TEST_RES_FILES)
@@ -47,6 +126,12 @@ clean:
 cleanall: clean
        @$(RM) $(TEST0_FILE)
 
+time: cleantime $(TIME_FILE)
+       @$(CAT) $(TIME_FILE)
+
+cleantime:
+       @$(RM) $(TIME_FILE)
+
 $(TEST1_FILE): $(CMD_FILE)
        @-$(call exec_cmd,$^,$@,$(ERR_FILE))
 
@@ -60,4 +145,4 @@ $(DETAIL_FILE): $(LOG_FILE)
        @$(call report_files,$(LOG_FILE) $(CMDSRC_FILE) $(TEST0_FILE) $(ERR_FILE) $(DIFF_FILE) $(TEST1_FILE),$@)
 
 $(TIME_FILE): $(CMD_FILE)
-       $(call time_cmd,$^,$@)
+       @$(call time_cmd,$^,$@)

diff --git a/test/system/casl2/cmd_ADDA_adda0/Makefile b/test/system/casl2/cmd_ADDA_adda0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDA_adda0/Makefile
+++ b/test/system/casl2/cmd_ADDA_adda0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDA_adda0__o/Makefile b/test/system/casl2/cmd_ADDA_adda0__o/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDA_adda0__o/Makefile
+++ b/test/system/casl2/cmd_ADDA_adda0__o/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDA_adda0__z/Makefile b/test/system/casl2/cmd_ADDA_adda0__z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDA_adda0__z/Makefile
+++ b/test/system/casl2/cmd_ADDA_adda0__z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDA_adda0__z/desc.txt b/test/system/casl2/cmd_ADDA_adda0__z/desc.txt
new file mode 100644 (file)
index 0000000..50a1426
--- /dev/null
+++ b/test/system/casl2/cmd_ADDA_adda0__z/desc.txt
@@ -0,0 +1 @@
+ADDAコマンドのテスト。演算結果が零

diff --git a/test/system/casl2/cmd_ADDA_adda0_ao/Makefile b/test/system/casl2/cmd_ADDA_adda0_ao/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDA_adda0_ao/Makefile
+++ b/test/system/casl2/cmd_ADDA_adda0_ao/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDA_adda0_ao/cmd b/test/system/casl2/cmd_ADDA_adda0_ao/cmd
index ac2ca81..8bfde1f 100755 (executable)
--- a/test/system/casl2/cmd_ADDA_adda0_ao/cmd
+++ b/test/system/casl2/cmd_ADDA_adda0_ao/cmd
@@ -1,2 +1,3 @@
-cat ../../../../as/cmd/ADDA/adda0_ao.casl
-../../../../casl2 -atd -M8 ../../../../as/cmd/ADDA/adda0_ao.casl
+YACASL2DIR=../../../..
+cat $YACASL2DIR/as/cmd/ADDA/adda0_ao.casl
+$YACASL2DIR/casl2 -atd -M8 $YACASL2DIR/as/cmd/ADDA/adda0_ao.casl

diff --git a/test/system/casl2/cmd_ADDA_adda0_ao/desc.txt b/test/system/casl2/cmd_ADDA_adda0_ao/desc.txt
new file mode 100644 (file)
index 0000000..dc3ec14
--- /dev/null
+++ b/test/system/casl2/cmd_ADDA_adda0_ao/desc.txt
@@ -0,0 +1 @@
+ADDAコマンドのテスト。正数でオーバーフロー

diff --git a/test/system/casl2/cmd_ADDA_adda0_as0/Makefile b/test/system/casl2/cmd_ADDA_adda0_as0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDA_adda0_as0/Makefile
+++ b/test/system/casl2/cmd_ADDA_adda0_as0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDA_adda0_as0/cmd b/test/system/casl2/cmd_ADDA_adda0_as0/cmd
index 05daae7..99e30fe 100755 (executable)
--- a/test/system/casl2/cmd_ADDA_adda0_as0/cmd
+++ b/test/system/casl2/cmd_ADDA_adda0_as0/cmd
@@ -1,2 +1,3 @@
-cat ../../../../as/cmd/ADDA/adda0_as0.casl
-../../../../casl2 -atd -M8 ../../../../as/cmd/ADDA/adda0_as0.casl
+YACASL2DIR=../../../..
+cat $YACASL2DIR/as/cmd/ADDA/adda0_as0.casl
+$YACASL2DIR/casl2 -atd -M8 $YACASL2DIR/as/cmd/ADDA/adda0_as0.casl

diff --git a/test/system/casl2/cmd_ADDA_adda0_as0/desc.txt b/test/system/casl2/cmd_ADDA_adda0_as0/desc.txt
new file mode 100644 (file)
index 0000000..e9e93db
--- /dev/null
+++ b/test/system/casl2/cmd_ADDA_adda0_as0/desc.txt
@@ -0,0 +1 @@
+ADDAコマンドのテスト。演算結果が負数

diff --git a/test/system/casl2/cmd_ADDA_adda0_as1/Makefile b/test/system/casl2/cmd_ADDA_adda0_as1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDA_adda0_as1/Makefile
+++ b/test/system/casl2/cmd_ADDA_adda0_as1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDA_adda0_az/Makefile b/test/system/casl2/cmd_ADDA_adda0_az/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDA_adda0_az/Makefile
+++ b/test/system/casl2/cmd_ADDA_adda0_az/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDA_adda0_az/desc.txt b/test/system/casl2/cmd_ADDA_adda0_az/desc.txt
new file mode 100644 (file)
index 0000000..f8eeda4
--- /dev/null
+++ b/test/system/casl2/cmd_ADDA_adda0_az/desc.txt
@@ -0,0 +1 @@
+ADDAコマンドのテスト。ADDA r,adr 演算結果が零

diff --git a/test/system/casl2/cmd_ADDA_adda0_lo/Makefile b/test/system/casl2/cmd_ADDA_adda0_lo/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDA_adda0_lo/Makefile
+++ b/test/system/casl2/cmd_ADDA_adda0_lo/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDA_adda1/Makefile b/test/system/casl2/cmd_ADDA_adda1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDA_adda1/Makefile
+++ b/test/system/casl2/cmd_ADDA_adda1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDA_adda2/Makefile b/test/system/casl2/cmd_ADDA_adda2/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDA_adda2/Makefile
+++ b/test/system/casl2/cmd_ADDA_adda2/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDL_addl0/Makefile b/test/system/casl2/cmd_ADDL_addl0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDL_addl0/Makefile
+++ b/test/system/casl2/cmd_ADDL_addl0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDL_addl0__o/Makefile b/test/system/casl2/cmd_ADDL_addl0__o/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDL_addl0__o/Makefile
+++ b/test/system/casl2/cmd_ADDL_addl0__o/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDL_addl0__z/Makefile b/test/system/casl2/cmd_ADDL_addl0__z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDL_addl0__z/Makefile
+++ b/test/system/casl2/cmd_ADDL_addl0__z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDL_addl0_ao/Makefile b/test/system/casl2/cmd_ADDL_addl0_ao/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDL_addl0_ao/Makefile
+++ b/test/system/casl2/cmd_ADDL_addl0_ao/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDL_addl0_as0/Makefile b/test/system/casl2/cmd_ADDL_addl0_as0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDL_addl0_as0/Makefile
+++ b/test/system/casl2/cmd_ADDL_addl0_as0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDL_addl0_as1/Makefile b/test/system/casl2/cmd_ADDL_addl0_as1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDL_addl0_as1/Makefile
+++ b/test/system/casl2/cmd_ADDL_addl0_as1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDL_addl0_az/Makefile b/test/system/casl2/cmd_ADDL_addl0_az/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDL_addl0_az/Makefile
+++ b/test/system/casl2/cmd_ADDL_addl0_az/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDL_addl0_lo/Makefile b/test/system/casl2/cmd_ADDL_addl0_lo/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDL_addl0_lo/Makefile
+++ b/test/system/casl2/cmd_ADDL_addl0_lo/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDL_addl1/Makefile b/test/system/casl2/cmd_ADDL_addl1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDL_addl1/Makefile
+++ b/test/system/casl2/cmd_ADDL_addl1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ADDL_addl2/Makefile b/test/system/casl2/cmd_ADDL_addl2/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ADDL_addl2/Makefile
+++ b/test/system/casl2/cmd_ADDL_addl2/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_AND_and0/Makefile b/test/system/casl2/cmd_AND_and0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_AND_and0/Makefile
+++ b/test/system/casl2/cmd_AND_and0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_AND_and0_s/Makefile b/test/system/casl2/cmd_AND_and0_s/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_AND_and0_s/Makefile
+++ b/test/system/casl2/cmd_AND_and0_s/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_AND_and0_z/Makefile b/test/system/casl2/cmd_AND_and0_z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_AND_and0_z/Makefile
+++ b/test/system/casl2/cmd_AND_and0_z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_AND_and1/Makefile b/test/system/casl2/cmd_AND_and1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_AND_and1/Makefile
+++ b/test/system/casl2/cmd_AND_and1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_AND_and2/Makefile b/test/system/casl2/cmd_AND_and2/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_AND_and2/Makefile
+++ b/test/system/casl2/cmd_AND_and2/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_CALL_call0/Makefile b/test/system/casl2/cmd_CALL_call0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_CALL_call0/Makefile
+++ b/test/system/casl2/cmd_CALL_call0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_CALL_call1/Makefile b/test/system/casl2/cmd_CALL_call1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_CALL_call1/Makefile
+++ b/test/system/casl2/cmd_CALL_call1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_CPA_cpa0/Makefile b/test/system/casl2/cmd_CPA_cpa0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_CPA_cpa0/Makefile
+++ b/test/system/casl2/cmd_CPA_cpa0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_CPA_cpa0_ls/Makefile b/test/system/casl2/cmd_CPA_cpa0_ls/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_CPA_cpa0_ls/Makefile
+++ b/test/system/casl2/cmd_CPA_cpa0_ls/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_CPA_cpa0_s/Makefile b/test/system/casl2/cmd_CPA_cpa0_s/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_CPA_cpa0_s/Makefile
+++ b/test/system/casl2/cmd_CPA_cpa0_s/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_CPA_cpa0_z/Makefile b/test/system/casl2/cmd_CPA_cpa0_z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_CPA_cpa0_z/Makefile
+++ b/test/system/casl2/cmd_CPA_cpa0_z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_CPA_cpa1_s/Makefile b/test/system/casl2/cmd_CPA_cpa1_s/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_CPA_cpa1_s/Makefile
+++ b/test/system/casl2/cmd_CPA_cpa1_s/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_CPA_cpa2_s/Makefile b/test/system/casl2/cmd_CPA_cpa2_s/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_CPA_cpa2_s/Makefile
+++ b/test/system/casl2/cmd_CPA_cpa2_s/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_CPL_cpl0/Makefile b/test/system/casl2/cmd_CPL_cpl0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_CPL_cpl0/Makefile
+++ b/test/system/casl2/cmd_CPL_cpl0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_CPL_cpl0_ls/Makefile b/test/system/casl2/cmd_CPL_cpl0_ls/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_CPL_cpl0_ls/Makefile
+++ b/test/system/casl2/cmd_CPL_cpl0_ls/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_CPL_cpl0_s/Makefile b/test/system/casl2/cmd_CPL_cpl0_s/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_CPL_cpl0_s/Makefile
+++ b/test/system/casl2/cmd_CPL_cpl0_s/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_CPL_cpl0_z/Makefile b/test/system/casl2/cmd_CPL_cpl0_z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_CPL_cpl0_z/Makefile
+++ b/test/system/casl2/cmd_CPL_cpl0_z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_CPL_cpl1_s/Makefile b/test/system/casl2/cmd_CPL_cpl1_s/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_CPL_cpl1_s/Makefile
+++ b/test/system/casl2/cmd_CPL_cpl1_s/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_CPL_cpl2_s/Makefile b/test/system/casl2/cmd_CPL_cpl2_s/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_CPL_cpl2_s/Makefile
+++ b/test/system/casl2/cmd_CPL_cpl2_s/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_DC_dc_c0/Makefile b/test/system/casl2/cmd_DC_dc_c0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_DC_dc_c0/Makefile
+++ b/test/system/casl2/cmd_DC_dc_c0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_DC_dc_c1/Makefile b/test/system/casl2/cmd_DC_dc_c1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_DC_dc_c1/Makefile
+++ b/test/system/casl2/cmd_DC_dc_c1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_DC_dc_i0/Makefile b/test/system/casl2/cmd_DC_dc_i0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_DC_dc_i0/Makefile
+++ b/test/system/casl2/cmd_DC_dc_i0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_DC_dc_i1/Makefile b/test/system/casl2/cmd_DC_dc_i1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_DC_dc_i1/Makefile
+++ b/test/system/casl2/cmd_DC_dc_i1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_DC_dc_i_of/Makefile b/test/system/casl2/cmd_DC_dc_i_of/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_DC_dc_i_of/Makefile
+++ b/test/system/casl2/cmd_DC_dc_i_of/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_DS_ds/Makefile b/test/system/casl2/cmd_DS_ds/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_DS_ds/Makefile
+++ b/test/system/casl2/cmd_DS_ds/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_DS_ds_0/Makefile b/test/system/casl2/cmd_DS_ds_0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_DS_ds_0/Makefile
+++ b/test/system/casl2/cmd_DS_ds_0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_IN_in/Makefile b/test/system/casl2/cmd_IN_in/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_IN_in/Makefile
+++ b/test/system/casl2/cmd_IN_in/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JMI_jmi_m/Makefile b/test/system/casl2/cmd_JMI_jmi_m/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JMI_jmi_m/Makefile
+++ b/test/system/casl2/cmd_JMI_jmi_m/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JMI_jmi_o/Makefile b/test/system/casl2/cmd_JMI_jmi_o/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JMI_jmi_o/Makefile
+++ b/test/system/casl2/cmd_JMI_jmi_o/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JMI_jmi_p/Makefile b/test/system/casl2/cmd_JMI_jmi_p/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JMI_jmi_p/Makefile
+++ b/test/system/casl2/cmd_JMI_jmi_p/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JMI_jmi_z/Makefile b/test/system/casl2/cmd_JMI_jmi_z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JMI_jmi_z/Makefile
+++ b/test/system/casl2/cmd_JMI_jmi_z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JNZ_jnz_m/Makefile b/test/system/casl2/cmd_JNZ_jnz_m/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JNZ_jnz_m/Makefile
+++ b/test/system/casl2/cmd_JNZ_jnz_m/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JNZ_jnz_o/Makefile b/test/system/casl2/cmd_JNZ_jnz_o/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JNZ_jnz_o/Makefile
+++ b/test/system/casl2/cmd_JNZ_jnz_o/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JNZ_jnz_p/Makefile b/test/system/casl2/cmd_JNZ_jnz_p/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JNZ_jnz_p/Makefile
+++ b/test/system/casl2/cmd_JNZ_jnz_p/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JNZ_jnz_z/Makefile b/test/system/casl2/cmd_JNZ_jnz_z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JNZ_jnz_z/Makefile
+++ b/test/system/casl2/cmd_JNZ_jnz_z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JOV_jov_m/Makefile b/test/system/casl2/cmd_JOV_jov_m/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JOV_jov_m/Makefile
+++ b/test/system/casl2/cmd_JOV_jov_m/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JOV_jov_o/Makefile b/test/system/casl2/cmd_JOV_jov_o/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JOV_jov_o/Makefile
+++ b/test/system/casl2/cmd_JOV_jov_o/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JOV_jov_p/Makefile b/test/system/casl2/cmd_JOV_jov_p/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JOV_jov_p/Makefile
+++ b/test/system/casl2/cmd_JOV_jov_p/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JOV_jov_z/Makefile b/test/system/casl2/cmd_JOV_jov_z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JOV_jov_z/Makefile
+++ b/test/system/casl2/cmd_JOV_jov_z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JPL_jpl_m/Makefile b/test/system/casl2/cmd_JPL_jpl_m/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JPL_jpl_m/Makefile
+++ b/test/system/casl2/cmd_JPL_jpl_m/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JPL_jpl_o/Makefile b/test/system/casl2/cmd_JPL_jpl_o/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JPL_jpl_o/Makefile
+++ b/test/system/casl2/cmd_JPL_jpl_o/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JPL_jpl_p/Makefile b/test/system/casl2/cmd_JPL_jpl_p/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JPL_jpl_p/Makefile
+++ b/test/system/casl2/cmd_JPL_jpl_p/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JPL_jpl_z/Makefile b/test/system/casl2/cmd_JPL_jpl_z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JPL_jpl_z/Makefile
+++ b/test/system/casl2/cmd_JPL_jpl_z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JUMP_jump_m/Makefile b/test/system/casl2/cmd_JUMP_jump_m/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JUMP_jump_m/Makefile
+++ b/test/system/casl2/cmd_JUMP_jump_m/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JUMP_jump_o/Makefile b/test/system/casl2/cmd_JUMP_jump_o/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JUMP_jump_o/Makefile
+++ b/test/system/casl2/cmd_JUMP_jump_o/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JUMP_jump_p/Makefile b/test/system/casl2/cmd_JUMP_jump_p/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JUMP_jump_p/Makefile
+++ b/test/system/casl2/cmd_JUMP_jump_p/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JUMP_jump_z/Makefile b/test/system/casl2/cmd_JUMP_jump_z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JUMP_jump_z/Makefile
+++ b/test/system/casl2/cmd_JUMP_jump_z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JZE_jze_m/Makefile b/test/system/casl2/cmd_JZE_jze_m/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JZE_jze_m/Makefile
+++ b/test/system/casl2/cmd_JZE_jze_m/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JZE_jze_o/Makefile b/test/system/casl2/cmd_JZE_jze_o/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JZE_jze_o/Makefile
+++ b/test/system/casl2/cmd_JZE_jze_o/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JZE_jze_p/Makefile b/test/system/casl2/cmd_JZE_jze_p/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JZE_jze_p/Makefile
+++ b/test/system/casl2/cmd_JZE_jze_p/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_JZE_jze_z/Makefile b/test/system/casl2/cmd_JZE_jze_z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_JZE_jze_z/Makefile
+++ b/test/system/casl2/cmd_JZE_jze_z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_LAD_lad0/Makefile b/test/system/casl2/cmd_LAD_lad0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_LAD_lad0/Makefile
+++ b/test/system/casl2/cmd_LAD_lad0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_LAD_lad1/Makefile b/test/system/casl2/cmd_LAD_lad1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_LAD_lad1/Makefile
+++ b/test/system/casl2/cmd_LAD_lad1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_LAD_lad1_o/Makefile b/test/system/casl2/cmd_LAD_lad1_o/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_LAD_lad1_o/Makefile
+++ b/test/system/casl2/cmd_LAD_lad1_o/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_LAD_lad1_s/Makefile b/test/system/casl2/cmd_LAD_lad1_s/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_LAD_lad1_s/Makefile
+++ b/test/system/casl2/cmd_LAD_lad1_s/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_LD_ld0/Makefile b/test/system/casl2/cmd_LD_ld0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_LD_ld0/Makefile
+++ b/test/system/casl2/cmd_LD_ld0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_LD_ld0_l/Makefile b/test/system/casl2/cmd_LD_ld0_l/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_LD_ld0_l/Makefile
+++ b/test/system/casl2/cmd_LD_ld0_l/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_LD_ld1/Makefile b/test/system/casl2/cmd_LD_ld1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_LD_ld1/Makefile
+++ b/test/system/casl2/cmd_LD_ld1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_LD_ld2/Makefile b/test/system/casl2/cmd_LD_ld2/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_LD_ld2/Makefile
+++ b/test/system/casl2/cmd_LD_ld2/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_NOP_nop/Makefile b/test/system/casl2/cmd_NOP_nop/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_NOP_nop/Makefile
+++ b/test/system/casl2/cmd_NOP_nop/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_OR_or0/Makefile b/test/system/casl2/cmd_OR_or0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_OR_or0/Makefile
+++ b/test/system/casl2/cmd_OR_or0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_OR_or0_s/Makefile b/test/system/casl2/cmd_OR_or0_s/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_OR_or0_s/Makefile
+++ b/test/system/casl2/cmd_OR_or0_s/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_OR_or0_z/Makefile b/test/system/casl2/cmd_OR_or0_z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_OR_or0_z/Makefile
+++ b/test/system/casl2/cmd_OR_or0_z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_OR_or1/Makefile b/test/system/casl2/cmd_OR_or1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_OR_or1/Makefile
+++ b/test/system/casl2/cmd_OR_or1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_OR_or2/Makefile b/test/system/casl2/cmd_OR_or2/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_OR_or2/Makefile
+++ b/test/system/casl2/cmd_OR_or2/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_OUT_out/Makefile b/test/system/casl2/cmd_OUT_out/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_OUT_out/Makefile
+++ b/test/system/casl2/cmd_OUT_out/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_POP_push_pop_0/Makefile b/test/system/casl2/cmd_POP_push_pop_0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_POP_push_pop_0/Makefile
+++ b/test/system/casl2/cmd_POP_push_pop_0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_POP_push_pop_1/Makefile b/test/system/casl2/cmd_POP_push_pop_1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_POP_push_pop_1/Makefile
+++ b/test/system/casl2/cmd_POP_push_pop_1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_RPOP_rpop/Makefile b/test/system/casl2/cmd_RPOP_rpop/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_RPOP_rpop/Makefile
+++ b/test/system/casl2/cmd_RPOP_rpop/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_RPUSH_rpush/Makefile b/test/system/casl2/cmd_RPUSH_rpush/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_RPUSH_rpush/Makefile
+++ b/test/system/casl2/cmd_RPUSH_rpush/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SLA_sla/Makefile b/test/system/casl2/cmd_SLA_sla/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SLA_sla/Makefile
+++ b/test/system/casl2/cmd_SLA_sla/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SLA_sla_o/Makefile b/test/system/casl2/cmd_SLA_sla_o/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SLA_sla_o/Makefile
+++ b/test/system/casl2/cmd_SLA_sla_o/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SLA_sla_os/Makefile b/test/system/casl2/cmd_SLA_sla_os/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SLA_sla_os/Makefile
+++ b/test/system/casl2/cmd_SLA_sla_os/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SLA_sla_oz/Makefile b/test/system/casl2/cmd_SLA_sla_oz/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SLA_sla_oz/Makefile
+++ b/test/system/casl2/cmd_SLA_sla_oz/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SLA_sla_s/Makefile b/test/system/casl2/cmd_SLA_sla_s/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SLA_sla_s/Makefile
+++ b/test/system/casl2/cmd_SLA_sla_s/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SLA_sla_z/Makefile b/test/system/casl2/cmd_SLA_sla_z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SLA_sla_z/Makefile
+++ b/test/system/casl2/cmd_SLA_sla_z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SLL_sll/Makefile b/test/system/casl2/cmd_SLL_sll/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SLL_sll/Makefile
+++ b/test/system/casl2/cmd_SLL_sll/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SLL_sll_o/Makefile b/test/system/casl2/cmd_SLL_sll_o/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SLL_sll_o/Makefile
+++ b/test/system/casl2/cmd_SLL_sll_o/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SLL_sll_os/Makefile b/test/system/casl2/cmd_SLL_sll_os/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SLL_sll_os/Makefile
+++ b/test/system/casl2/cmd_SLL_sll_os/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SLL_sll_oz/Makefile b/test/system/casl2/cmd_SLL_sll_oz/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SLL_sll_oz/Makefile
+++ b/test/system/casl2/cmd_SLL_sll_oz/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SLL_sll_s/Makefile b/test/system/casl2/cmd_SLL_sll_s/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SLL_sll_s/Makefile
+++ b/test/system/casl2/cmd_SLL_sll_s/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SLL_sll_z/Makefile b/test/system/casl2/cmd_SLL_sll_z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SLL_sll_z/Makefile
+++ b/test/system/casl2/cmd_SLL_sll_z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SRA_sra/Makefile b/test/system/casl2/cmd_SRA_sra/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SRA_sra/Makefile
+++ b/test/system/casl2/cmd_SRA_sra/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SRA_sra_o/Makefile b/test/system/casl2/cmd_SRA_sra_o/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SRA_sra_o/Makefile
+++ b/test/system/casl2/cmd_SRA_sra_o/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SRA_sra_os/Makefile b/test/system/casl2/cmd_SRA_sra_os/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SRA_sra_os/Makefile
+++ b/test/system/casl2/cmd_SRA_sra_os/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SRA_sra_oz/Makefile b/test/system/casl2/cmd_SRA_sra_oz/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SRA_sra_oz/Makefile
+++ b/test/system/casl2/cmd_SRA_sra_oz/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SRA_sra_s/Makefile b/test/system/casl2/cmd_SRA_sra_s/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SRA_sra_s/Makefile
+++ b/test/system/casl2/cmd_SRA_sra_s/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SRA_sra_z/Makefile b/test/system/casl2/cmd_SRA_sra_z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SRA_sra_z/Makefile
+++ b/test/system/casl2/cmd_SRA_sra_z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SRL_srl/Makefile b/test/system/casl2/cmd_SRL_srl/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SRL_srl/Makefile
+++ b/test/system/casl2/cmd_SRL_srl/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SRL_srl_o/Makefile b/test/system/casl2/cmd_SRL_srl_o/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SRL_srl_o/Makefile
+++ b/test/system/casl2/cmd_SRL_srl_o/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SRL_srl_oz/Makefile b/test/system/casl2/cmd_SRL_srl_oz/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SRL_srl_oz/Makefile
+++ b/test/system/casl2/cmd_SRL_srl_oz/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SRL_srl_s/Makefile b/test/system/casl2/cmd_SRL_srl_s/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SRL_srl_s/Makefile
+++ b/test/system/casl2/cmd_SRL_srl_s/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SRL_srl_z/Makefile b/test/system/casl2/cmd_SRL_srl_z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SRL_srl_z/Makefile
+++ b/test/system/casl2/cmd_SRL_srl_z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ST_st0/Makefile b/test/system/casl2/cmd_ST_st0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ST_st0/Makefile
+++ b/test/system/casl2/cmd_ST_st0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_ST_st1/Makefile b/test/system/casl2/cmd_ST_st1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_ST_st1/Makefile
+++ b/test/system/casl2/cmd_ST_st1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBA_suba0/Makefile b/test/system/casl2/cmd_SUBA_suba0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBA_suba0/Makefile
+++ b/test/system/casl2/cmd_SUBA_suba0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBA_suba0__o/Makefile b/test/system/casl2/cmd_SUBA_suba0__o/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBA_suba0__o/Makefile
+++ b/test/system/casl2/cmd_SUBA_suba0__o/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBA_suba0__z/Makefile b/test/system/casl2/cmd_SUBA_suba0__z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBA_suba0__z/Makefile
+++ b/test/system/casl2/cmd_SUBA_suba0__z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBA_suba0_ao/Makefile b/test/system/casl2/cmd_SUBA_suba0_ao/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBA_suba0_ao/Makefile
+++ b/test/system/casl2/cmd_SUBA_suba0_ao/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBA_suba0_as0/Makefile b/test/system/casl2/cmd_SUBA_suba0_as0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBA_suba0_as0/Makefile
+++ b/test/system/casl2/cmd_SUBA_suba0_as0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBA_suba0_as1/Makefile b/test/system/casl2/cmd_SUBA_suba0_as1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBA_suba0_as1/Makefile
+++ b/test/system/casl2/cmd_SUBA_suba0_as1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBA_suba0_lo/Makefile b/test/system/casl2/cmd_SUBA_suba0_lo/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBA_suba0_lo/Makefile
+++ b/test/system/casl2/cmd_SUBA_suba0_lo/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBA_suba1/Makefile b/test/system/casl2/cmd_SUBA_suba1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBA_suba1/Makefile
+++ b/test/system/casl2/cmd_SUBA_suba1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBA_suba2/Makefile b/test/system/casl2/cmd_SUBA_suba2/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBA_suba2/Makefile
+++ b/test/system/casl2/cmd_SUBA_suba2/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBL_subl0/Makefile b/test/system/casl2/cmd_SUBL_subl0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBL_subl0/Makefile
+++ b/test/system/casl2/cmd_SUBL_subl0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBL_subl0__o/Makefile b/test/system/casl2/cmd_SUBL_subl0__o/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBL_subl0__o/Makefile
+++ b/test/system/casl2/cmd_SUBL_subl0__o/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBL_subl0__z/Makefile b/test/system/casl2/cmd_SUBL_subl0__z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBL_subl0__z/Makefile
+++ b/test/system/casl2/cmd_SUBL_subl0__z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBL_subl0_ao/Makefile b/test/system/casl2/cmd_SUBL_subl0_ao/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBL_subl0_ao/Makefile
+++ b/test/system/casl2/cmd_SUBL_subl0_ao/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBL_subl0_as0/Makefile b/test/system/casl2/cmd_SUBL_subl0_as0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBL_subl0_as0/Makefile
+++ b/test/system/casl2/cmd_SUBL_subl0_as0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBL_subl0_as1/Makefile b/test/system/casl2/cmd_SUBL_subl0_as1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBL_subl0_as1/Makefile
+++ b/test/system/casl2/cmd_SUBL_subl0_as1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBL_subl0_lo/Makefile b/test/system/casl2/cmd_SUBL_subl0_lo/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBL_subl0_lo/Makefile
+++ b/test/system/casl2/cmd_SUBL_subl0_lo/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBL_subl1/Makefile b/test/system/casl2/cmd_SUBL_subl1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBL_subl1/Makefile
+++ b/test/system/casl2/cmd_SUBL_subl1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SUBL_subl2/Makefile b/test/system/casl2/cmd_SUBL_subl2/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SUBL_subl2/Makefile
+++ b/test/system/casl2/cmd_SUBL_subl2/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SVC_svc1/Makefile b/test/system/casl2/cmd_SVC_svc1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SVC_svc1/Makefile
+++ b/test/system/casl2/cmd_SVC_svc1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_SVC_svc2/Makefile b/test/system/casl2/cmd_SVC_svc2/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_SVC_svc2/Makefile
+++ b/test/system/casl2/cmd_SVC_svc2/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_XOR_xor0/Makefile b/test/system/casl2/cmd_XOR_xor0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_XOR_xor0/Makefile
+++ b/test/system/casl2/cmd_XOR_xor0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_XOR_xor0_s/Makefile b/test/system/casl2/cmd_XOR_xor0_s/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_XOR_xor0_s/Makefile
+++ b/test/system/casl2/cmd_XOR_xor0_s/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_XOR_xor0_z/Makefile b/test/system/casl2/cmd_XOR_xor0_z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_XOR_xor0_z/Makefile
+++ b/test/system/casl2/cmd_XOR_xor0_z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_XOR_xor1/Makefile b/test/system/casl2/cmd_XOR_xor1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_XOR_xor1/Makefile
+++ b/test/system/casl2/cmd_XOR_xor1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_XOR_xor2/Makefile b/test/system/casl2/cmd_XOR_xor2/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_XOR_xor2/Makefile
+++ b/test/system/casl2/cmd_XOR_xor2/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/cmd_XOR_xor2_clear/Makefile b/test/system/casl2/cmd_XOR_xor2_clear/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/cmd_XOR_xor2_clear/Makefile
+++ b/test/system/casl2/cmd_XOR_xor2_clear/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_101/Makefile b/test/system/casl2/err_101/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_101/Makefile
+++ b/test/system/casl2/err_101/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_103/Makefile b/test/system/casl2/err_103/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_103/Makefile
+++ b/test/system/casl2/err_103/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_104/Makefile b/test/system/casl2/err_104/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_104/Makefile
+++ b/test/system/casl2/err_104/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_105/Makefile b/test/system/casl2/err_105/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_105/Makefile
+++ b/test/system/casl2/err_105/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_106_DC/Makefile b/test/system/casl2/err_106_DC/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_106_DC/Makefile
+++ b/test/system/casl2/err_106_DC/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_106_DS/Makefile b/test/system/casl2/err_106_DS/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_106_DS/Makefile
+++ b/test/system/casl2/err_106_DS/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_107/Makefile b/test/system/casl2/err_107/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_107/Makefile
+++ b/test/system/casl2/err_107/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_108/Makefile b/test/system/casl2/err_108/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_108/Makefile
+++ b/test/system/casl2/err_108/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_109/Makefile b/test/system/casl2/err_109/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_109/Makefile
+++ b/test/system/casl2/err_109/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_110/Makefile b/test/system/casl2/err_110/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_110/Makefile
+++ b/test/system/casl2/err_110/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_111/Makefile b/test/system/casl2/err_111/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_111/Makefile
+++ b/test/system/casl2/err_111/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_112/Makefile b/test/system/casl2/err_112/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_112/Makefile
+++ b/test/system/casl2/err_112/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_113/Makefile b/test/system/casl2/err_113/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_113/Makefile
+++ b/test/system/casl2/err_113/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_114/Makefile b/test/system/casl2/err_114/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_114/Makefile
+++ b/test/system/casl2/err_114/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_115/Makefile b/test/system/casl2/err_115/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_115/Makefile
+++ b/test/system/casl2/err_115/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_116/Makefile b/test/system/casl2/err_116/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_116/Makefile
+++ b/test/system/casl2/err_116/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_117/Makefile b/test/system/casl2/err_117/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_117/Makefile
+++ b/test/system/casl2/err_117/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_118/Makefile b/test/system/casl2/err_118/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_118/Makefile
+++ b/test/system/casl2/err_118/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_119/Makefile b/test/system/casl2/err_119/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_119/Makefile
+++ b/test/system/casl2/err_119/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_120/Makefile b/test/system/casl2/err_120/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_120/Makefile
+++ b/test/system/casl2/err_120/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_121/Makefile b/test/system/casl2/err_121/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_121/Makefile
+++ b/test/system/casl2/err_121/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_123/Makefile b/test/system/casl2/err_123/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_123/Makefile
+++ b/test/system/casl2/err_123/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_124/Makefile b/test/system/casl2/err_124/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_124/Makefile
+++ b/test/system/casl2/err_124/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_125/Makefile b/test/system/casl2/err_125/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_125/Makefile
+++ b/test/system/casl2/err_125/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_126/Makefile b/test/system/casl2/err_126/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_126/Makefile
+++ b/test/system/casl2/err_126/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_202/Makefile b/test/system/casl2/err_202/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_202/Makefile
+++ b/test/system/casl2/err_202/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_203/Makefile b/test/system/casl2/err_203/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_203/Makefile
+++ b/test/system/casl2/err_203/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_204/Makefile b/test/system/casl2/err_204/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_204/Makefile
+++ b/test/system/casl2/err_204/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_205/Makefile b/test/system/casl2/err_205/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_205/Makefile
+++ b/test/system/casl2/err_205/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_206/Makefile b/test/system/casl2/err_206/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_206/Makefile
+++ b/test/system/casl2/err_206/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/err_207/Makefile b/test/system/casl2/err_207/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/err_207/Makefile
+++ b/test/system/casl2/err_207/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/hello/Makefile b/test/system/casl2/hello/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/hello/Makefile
+++ b/test/system/casl2/hello/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/lib_abs/Makefile b/test/system/casl2/lib_abs/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/lib_abs/Makefile
+++ b/test/system/casl2/lib_abs/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/lib_addl32/Makefile b/test/system/casl2/lib_addl32/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/lib_addl32/Makefile
+++ b/test/system/casl2/lib_addl32/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/lib_divl/Makefile b/test/system/casl2/lib_divl/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/lib_divl/Makefile
+++ b/test/system/casl2/lib_divl/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/lib_inl/Makefile b/test/system/casl2/lib_inl/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/lib_inl/Makefile
+++ b/test/system/casl2/lib_inl/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/lib_minim/Makefile b/test/system/casl2/lib_minim/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/lib_minim/Makefile
+++ b/test/system/casl2/lib_minim/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/lib_mula/Makefile b/test/system/casl2/lib_mula/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/lib_mula/Makefile
+++ b/test/system/casl2/lib_mula/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/lib_mull/Makefile b/test/system/casl2/lib_mull/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/lib_mull/Makefile
+++ b/test/system/casl2/lib_mull/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/lib_outa/Makefile b/test/system/casl2/lib_outa/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/lib_outa/Makefile
+++ b/test/system/casl2/lib_outa/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/lib_outa_q15/Makefile b/test/system/casl2/lib_outa_q15/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/lib_outa_q15/Makefile
+++ b/test/system/casl2/lib_outa_q15/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/lib_outb/Makefile b/test/system/casl2/lib_outb/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/lib_outb/Makefile
+++ b/test/system/casl2/lib_outb/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/lib_outl/Makefile b/test/system/casl2/lib_outl/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/lib_outl/Makefile
+++ b/test/system/casl2/lib_outl/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/lib_outl_q15/Makefile b/test/system/casl2/lib_outl_q15/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/lib_outl_q15/Makefile
+++ b/test/system/casl2/lib_outl_q15/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/lib_rev/Makefile b/test/system/casl2/lib_rev/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/lib_rev/Makefile
+++ b/test/system/casl2/lib_rev/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/opt_h/Makefile b/test/system/casl2/opt_h/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/opt_h/Makefile
+++ b/test/system/casl2/opt_h/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/opt_opterr/Makefile b/test/system/casl2/opt_opterr/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/opt_opterr/Makefile
+++ b/test/system/casl2/opt_opterr/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/opt_s/Makefile b/test/system/casl2/opt_s/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/opt_s/Makefile
+++ b/test/system/casl2/opt_s/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/opt_sL/Makefile b/test/system/casl2/opt_sL/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/opt_sL/Makefile
+++ b/test/system/casl2/opt_sL/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/opt_slA/Makefile b/test/system/casl2/opt_slA/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/opt_slA/Makefile
+++ b/test/system/casl2/opt_slA/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/opt_slaO/Makefile b/test/system/casl2/opt_slaO/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/opt_slaO/Makefile
+++ b/test/system/casl2/opt_slaO/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/opt_slaOn/Makefile b/test/system/casl2/opt_slaOn/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/opt_slaOn/Makefile
+++ b/test/system/casl2/opt_slaOn/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/opt_slao_T/Makefile b/test/system/casl2/opt_slao_T/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/opt_slao_T/Makefile
+++ b/test/system/casl2/opt_slao_T/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/opt_slaot/Makefile b/test/system/casl2/opt_slaot/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/opt_slaot/Makefile
+++ b/test/system/casl2/opt_slaot/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/casl2/opt_slaotd/Makefile b/test/system/casl2/opt_slaotd/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/casl2/opt_slaotd/Makefile
+++ b/test/system/casl2/opt_slaotd/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/comet2/Define.mk b/test/system/comet2/Define.mk
index 92e3b8e..ff5b4b0 100644 (file)
--- a/test/system/comet2/Define.mk
+++ b/test/system/comet2/Define.mk
@@ -47,6 +47,8 @@ EXPR ?= expr
 
 LN ?= ln -s
 
+SED ?= sed
+
 ######################################################################
 # テストグループとテストでの共通マクロ
 ######################################################################
@@ -63,31 +65,57 @@ define chk_file_ext
     $(if $(wildcard $1),$(error $1 exists in $(CURRDIR)))
 endef
 
+# 指定したディレクトリーを作成
+# 引数は、ディレクトリー名
+# 用例: $(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; )
+    $(if $(filter $(SRC),c),$(call puts_cmd_c,$1))
+endef
+
+# C言語の関数をテストするための設定を、指定されたファイルに出力
+# 引数は、ファイル名
+# 用例: $(call puts_cmd_c,file)
+define puts_cmd_c
+    $(ECHO) >>$1
+    $(ECHO) "CC := gcc" >>$1
+    $(ECHO) "CFLAGS := -Wall" >>$1
+    $(ECHO) >>$1
+    $(ECHO) ".INTERMEDIATE:" "$$""(CMD_FILE)" >>$1
+    $(ECHO) >>$1
+    $(ECHO) "CMDSRC_FILE := cmd.c" >>$1
+    $(ECHO) "TESTTARGET_FILES :=       # Set test target files" >>$1
+    $(ECHO) >>$1
+    $(ECHO) "$$""(CMD_FILE):" "$$""(CMDSRC_FILE)" "$$""(TESTTARGET_FILES)" >>$1
+    $(ECHO) "  ""$$""(CC)" "$$""(CFLAGS)" "-o" "$$""@" "$$""^" >>$1
+endef
+
 ######################################################################
 # テストグループのディレクトリー
 ######################################################################
 
 # テストグループとテストの変数を定義したMakefile
-DEF_FILE := Define.mk
-
-# テストグループの変数を定義したMakefile
-DEF_GROUP_FILE := Define_group.mk
-
-# テストの変数を定義したMakefile
-DEF_TEST_FILE := Define_test.mk
+DEFINE_FILE := Define.mk
 
 # テストのターゲットを定義したMakefile
 TEST_MAKEFILE := Test.mk
 
 # すべてのMakefile群
-MAKEFILES := $(DEF_FILE) $(DEF_GROUP_FILE) $(DEF_TEST_FILE) $(TEST_MAKEFILE)
+MAKEFILES := $(DEFINE_FILE) $(TEST_MAKEFILE)
 
 # すべてのMakefile群の絶対パス
 MAKEFILES_ABS := $(foreach file,$(MAKEFILES),$(CURRDIR)/$(file))
 
-# テストごとのMakefileでインクルードするMakefile群
-TEST_MAKEFILES := $(DEF_FILE) $(DEF_TEST_FILE) $(TEST_MAKEFILE)
-
 ######################################################################
 # テストのディレクトリー
 ######################################################################
@@ -98,20 +126,20 @@ CMD_FILE := cmd
 # テスト説明ファイル
 DESC_FILE := desc.txt
 
-# テスト想定結果ファイル
+# テスト想定ファイル
 TEST0_FILE := 0.txt
 
 # テスト結果ファイル
 TEST1_FILE := 1.txt
 
 # テストの、想定結果と結果の差分ファイル
-DIFF_FILE := diff.txt
+DIFF_FILE := diff.log
 
 # テストエラーファイル
-ERR_FILE := err.txt
+ERR_FILE := err.log
 
 # テストログファイル
-LOG_FILE := test.log
+LOG_FILE := summary.log
 
 # 実行時間ファイル
 TIME_FILE := time.log

diff --git a/test/system/comet2/Define_group.mk b/test/system/comet2/Define_group.mk
deleted file mode 100644 (file)
index a572469..0000000
--- a/test/system/comet2/Define_group.mk
+++ /dev/null
@@ -1,96 +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
-    $(ECHO) $(dir $1) >>$2;
-    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/test/system/comet2/Define_test.mk b/test/system/comet2/Define_test.mk
deleted file mode 100644 (file)
index c3508ca..0000000
--- a/test/system/comet2/Define_test.mk
+++ /dev/null
@@ -1,77 +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,file_cmd,file_out)
-define time_cmd
-    if test ! -x $1; then $(CHMOD) u+x $1; fi
-    ($(TIME) ./$1 1>$(DEV_NULL) 2>$(DEV_NULL)) 2>&1 | $(GREP) '^real' >$2
-endef
-
-# テスト実行コマンド。引数は、コマンドファイル、出力ファイル、エラーファイル
-# コマンドファイルを実行し、標準出力を出力ファイルに保存。
-# エラー発生時は、エラー出力を出力ファイルとエラーファイルに保存。
-# 用例: $(call exec_cmd,file_cmd,file_out,file_err)
-define exec_cmd
-    if test ! -x $1; then $(CHMOD) u+x $1; fi
-    ./$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
-    $(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/test/system/comet2/Makefile b/test/system/comet2/Makefile
index 6be7c11..01d5a27 100644 (file)
--- a/test/system/comet2/Makefile
+++ b/test/system/comet2/Makefile
@@ -13,7 +13,87 @@
 SHELL = /bin/sh
 
 include Define.mk
-include Define_group.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 := Summary.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 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
+    $(ECHO) $(dir $1) >>$2;
+    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. Details 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
 
 .PHONY: check checkall time create clean cleantime
 
@@ -25,7 +105,7 @@ time: cleantime $(GROUP_TIME_FILE)
 
 create:
        @$(call create_dir,$(TEST))
-       @$(call create_makefile,$(TEST)/$(MAKEFILE),$(TEST_MAKEFILES))
+       @$(call create_makefile,$(TEST)/$(MAKEFILE),$(MAKEFILES))
 
 clean:
        @$(call make_tests,$(TESTS),$@)

diff --git a/test/system/comet2/Test.mk b/test/system/comet2/Test.mk
index 8da44c1..11d4065 100644 (file)
--- a/test/system/comet2/Test.mk
+++ b/test/system/comet2/Test.mk
@@ -12,17 +12,97 @@
 # make cleantime: "make time" で作成されたファイルをクリア
 # make clean   : "make" で作成されたファイルをクリア
 # make cleanall: "make" と "make set" で作成されたファイルをクリア
-
 SHELL = /bin/bash
 
+######################################################################
+# マクロ
+######################################################################
+
+# 指定されたファイルをチェックし、空の場合は削除
+# 引数は、対象ファイル
+# 用例: $(call rm_null,file_target)
+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,file_cmd,file_out)
+define time_cmd
+    if test ! -x $1; then $(CHMOD) u+x $1; fi
+    ($(TIME) ./$1 1>$(DEV_NULL) 2>$(DEV_NULL)) 2>&1 | $(GREP) '^real' >$2
+endef
+
+# テスト実行コマンド。
+# コマンドファイルを実行し、標準出力を指定されたファイルに保存。
+# エラー発生時は、エラー出力を出力ファイルとエラーファイルに保存。
+# 引数は、コマンドファイル、出力ファイル、エラーファイル
+# 用例: $(call exec_cmd,file_cmd,file_out,file_err)
+define exec_cmd
+    if test ! -x $1; then $(CHMOD) u+x $1; fi
+    ./$1 >>$2 2>$3
+    if test -s $3; then $(CAT) $3 >>$2; fi
+    $(SED) -i '' -e "s%$(CURRDIR)%\$$PWD%g" $2
+    $(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) "Details 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
+    $(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
+
 # テスト名。カレントディレクトリー名から取得
 TEST = $(notdir $(CURRDIR))
 
 # コマンドファイルのソース
-CMDSRC_FILE := $(CMD_FILE)
-#CMDSRC_FILE := $(CMD_FILE).c
+CMDSRC_FILE ?= $(CMD_FILE)
 
-.PHONY: check set reset time cleantime clean cleanall
+.PHONY: check set reset clean cleanall time cleantime
 
 check: clean $(DETAIL_FILE)
        @$(call disp_test_log,$(LOG_FILE))
@@ -31,16 +111,14 @@ checkall: clean $(DETAIL_FILE) $(TIME_FILE)
        @$(CAT) $(TIME_FILE) >>$(LOG_FILE)
        @$(call disp_test_log,$(LOG_FILE))
 
-set:
+set: $(CMD_FILE)
+       @$(call chk_file_ext,$(TEST0_FILE))
        @-$(call exec_cmd,$(CMD_FILE),$(TEST0_FILE),$(ERR_FILE))
        @$(CAT) $(TEST0_FILE)
 
-reset: cleanall set
-
-time: cleantime $(TIME_FILE)
-
-cleantime:
-       @$(RM) $(TIME_FILE)
+reset: cleanall $(CMD_FILE)
+       @-$(call exec_cmd,$(CMD_FILE),$(TEST0_FILE),$(ERR_FILE))
+       @$(CAT) $(TEST0_FILE)
 
 clean:
        @$(RM) $(TEST_RES_FILES)
@@ -48,6 +126,12 @@ clean:
 cleanall: clean
        @$(RM) $(TEST0_FILE)
 
+time: cleantime $(TIME_FILE)
+       @$(CAT) $(TIME_FILE)
+
+cleantime:
+       @$(RM) $(TIME_FILE)
+
 $(TEST1_FILE): $(CMD_FILE)
        @-$(call exec_cmd,$^,$@,$(ERR_FILE))
 
@@ -61,4 +145,4 @@ $(DETAIL_FILE): $(LOG_FILE)
        @$(call report_files,$(LOG_FILE) $(CMDSRC_FILE) $(TEST0_FILE) $(ERR_FILE) $(DIFF_FILE) $(TEST1_FILE),$@)
 
 $(TIME_FILE): $(CMD_FILE)
-       $(call time_cmd,$^,$@)
+       @$(call time_cmd,$^,$@)

diff --git a/test/system/comet2/cmd_ADDA_adda0/Makefile b/test/system/comet2/cmd_ADDA_adda0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/comet2/cmd_ADDA_adda0/Makefile
+++ b/test/system/comet2/cmd_ADDA_adda0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/comet2/cmd_ADDA_adda0/cmd b/test/system/comet2/cmd_ADDA_adda0/cmd
index eff0ad7..6190e38 100755 (executable)
--- a/test/system/comet2/cmd_ADDA_adda0/cmd
+++ b/test/system/comet2/cmd_ADDA_adda0/cmd
@@ -1,2 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDA/adda0.casl
 ../../../../comet2 -td -M16 a.o
+rm -f a.o

diff --git a/test/system/comet2/cmd_ADDA_adda0__o/Makefile b/test/system/comet2/cmd_ADDA_adda0__o/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/comet2/cmd_ADDA_adda0__o/Makefile
+++ b/test/system/comet2/cmd_ADDA_adda0__o/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/comet2/cmd_ADDA_adda0__o/cmd b/test/system/comet2/cmd_ADDA_adda0__o/cmd
index dc31d6c..fcd51ea 100755 (executable)
--- a/test/system/comet2/cmd_ADDA_adda0__o/cmd
+++ b/test/system/comet2/cmd_ADDA_adda0__o/cmd
@@ -1,2 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDA/adda0__o.casl
 ../../../../comet2 -td -M8 a.o
+rm -f a.o

diff --git a/test/system/comet2/cmd_ADDA_adda0__z/Makefile b/test/system/comet2/cmd_ADDA_adda0__z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/comet2/cmd_ADDA_adda0__z/Makefile
+++ b/test/system/comet2/cmd_ADDA_adda0__z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/comet2/cmd_ADDA_adda0__z/cmd b/test/system/comet2/cmd_ADDA_adda0__z/cmd
index 6ec144a..96e4dee 100755 (executable)
--- a/test/system/comet2/cmd_ADDA_adda0__z/cmd
+++ b/test/system/comet2/cmd_ADDA_adda0__z/cmd
@@ -1,2 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDA/adda0__z.casl
 ../../../../comet2 -td -M8 a.o
+rm -f a.o

diff --git a/test/system/comet2/cmd_ADDA_adda0_ao/Makefile b/test/system/comet2/cmd_ADDA_adda0_ao/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/comet2/cmd_ADDA_adda0_ao/Makefile
+++ b/test/system/comet2/cmd_ADDA_adda0_ao/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/comet2/cmd_ADDA_adda0_ao/cmd b/test/system/comet2/cmd_ADDA_adda0_ao/cmd
index ca168d4..5da9fd3 100755 (executable)
--- a/test/system/comet2/cmd_ADDA_adda0_ao/cmd
+++ b/test/system/comet2/cmd_ADDA_adda0_ao/cmd
@@ -1,2 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDA/adda0_ao.casl
 ../../../../comet2 -td -M8 a.o
+rm -f a.o

diff --git a/test/system/comet2/cmd_ADDA_adda0_as0/Makefile b/test/system/comet2/cmd_ADDA_adda0_as0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/comet2/cmd_ADDA_adda0_as0/Makefile
+++ b/test/system/comet2/cmd_ADDA_adda0_as0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/comet2/cmd_ADDA_adda0_as0/cmd b/test/system/comet2/cmd_ADDA_adda0_as0/cmd
index a2f673f..97970c8 100755 (executable)
--- a/test/system/comet2/cmd_ADDA_adda0_as0/cmd
+++ b/test/system/comet2/cmd_ADDA_adda0_as0/cmd
@@ -1,2 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDA/adda0_as0.casl
 ../../../../comet2 -td -M8 a.o
+rm -f a.o

diff --git a/test/system/comet2/cmd_ADDA_adda0_as1/Makefile b/test/system/comet2/cmd_ADDA_adda0_as1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/comet2/cmd_ADDA_adda0_as1/Makefile
+++ b/test/system/comet2/cmd_ADDA_adda0_as1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/comet2/cmd_ADDA_adda0_as1/cmd b/test/system/comet2/cmd_ADDA_adda0_as1/cmd
index 9825c15..9f89218 100755 (executable)
--- a/test/system/comet2/cmd_ADDA_adda0_as1/cmd
+++ b/test/system/comet2/cmd_ADDA_adda0_as1/cmd
@@ -1,2 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDA/adda0_as1.casl
 ../../../../comet2 -td -M8 a.o
+rm -f a.o

diff --git a/test/system/comet2/cmd_ADDA_adda0_az/Makefile b/test/system/comet2/cmd_ADDA_adda0_az/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/comet2/cmd_ADDA_adda0_az/Makefile
+++ b/test/system/comet2/cmd_ADDA_adda0_az/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/comet2/cmd_ADDA_adda0_az/cmd b/test/system/comet2/cmd_ADDA_adda0_az/cmd
index b402c12..48909fd 100755 (executable)
--- a/test/system/comet2/cmd_ADDA_adda0_az/cmd
+++ b/test/system/comet2/cmd_ADDA_adda0_az/cmd
@@ -1,2 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDA/adda0_az.casl
 ../../../../comet2 -td -M8 a.o
+rm -f a.o

diff --git a/test/system/comet2/cmd_ADDA_adda0_lo/Makefile b/test/system/comet2/cmd_ADDA_adda0_lo/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/comet2/cmd_ADDA_adda0_lo/Makefile
+++ b/test/system/comet2/cmd_ADDA_adda0_lo/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/comet2/cmd_ADDA_adda0_lo/cmd b/test/system/comet2/cmd_ADDA_adda0_lo/cmd
index db6c486..e4ce929 100755 (executable)
--- a/test/system/comet2/cmd_ADDA_adda0_lo/cmd
+++ b/test/system/comet2/cmd_ADDA_adda0_lo/cmd
@@ -1,2 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDA/adda0_lo.casl
 ../../../../comet2 -td -M8 a.o
+rm -f a.o

diff --git a/test/system/comet2/cmd_ADDA_adda1/Makefile b/test/system/comet2/cmd_ADDA_adda1/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/comet2/cmd_ADDA_adda1/Makefile
+++ b/test/system/comet2/cmd_ADDA_adda1/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/comet2/cmd_ADDA_adda1/cmd b/test/system/comet2/cmd_ADDA_adda1/cmd
index e93ae55..d50bad6 100755 (executable)
--- a/test/system/comet2/cmd_ADDA_adda1/cmd
+++ b/test/system/comet2/cmd_ADDA_adda1/cmd
@@ -1,2 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDA/adda1.casl
 ../../../../comet2 -td -M16 a.o
+rm -f a.o

diff --git a/test/system/comet2/cmd_ADDA_adda2/Makefile b/test/system/comet2/cmd_ADDA_adda2/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/comet2/cmd_ADDA_adda2/Makefile
+++ b/test/system/comet2/cmd_ADDA_adda2/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/comet2/cmd_ADDA_adda2/cmd b/test/system/comet2/cmd_ADDA_adda2/cmd
index b2100f7..c2728ca 100755 (executable)
--- a/test/system/comet2/cmd_ADDA_adda2/cmd
+++ b/test/system/comet2/cmd_ADDA_adda2/cmd
@@ -1,2 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDA/adda2.casl
 ../../../../comet2 -td -M16 a.o
+rm -f a.o

diff --git a/test/system/comet2/cmd_ADDL_addl0/Makefile b/test/system/comet2/cmd_ADDL_addl0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/comet2/cmd_ADDL_addl0/Makefile
+++ b/test/system/comet2/cmd_ADDL_addl0/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/comet2/cmd_ADDL_addl0/cmd b/test/system/comet2/cmd_ADDL_addl0/cmd
index 2977c05..62be42d 100755 (executable)
--- a/test/system/comet2/cmd_ADDL_addl0/cmd
+++ b/test/system/comet2/cmd_ADDL_addl0/cmd
@@ -1,2 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDL/addl0.casl
 ../../../../comet2 -td -M8 a.o
+rm -f a.o

diff --git a/test/system/comet2/cmd_ADDL_addl0__o/Makefile b/test/system/comet2/cmd_ADDL_addl0__o/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/comet2/cmd_ADDL_addl0__o/Makefile
+++ b/test/system/comet2/cmd_ADDL_addl0__o/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/comet2/cmd_ADDL_addl0__o/cmd b/test/system/comet2/cmd_ADDL_addl0__o/cmd
index f7033f7..3259a70 100755 (executable)
--- a/test/system/comet2/cmd_ADDL_addl0__o/cmd
+++ b/test/system/comet2/cmd_ADDL_addl0__o/cmd
@@ -1,2 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDL/addl0__o.casl
 ../../../../comet2 -td -M8 a.o
+rm -f a.o

diff --git a/test/system/comet2/cmd_ADDL_addl0__z/Makefile b/test/system/comet2/cmd_ADDL_addl0__z/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/comet2/cmd_ADDL_addl0__z/Makefile
+++ b/test/system/comet2/cmd_ADDL_addl0__z/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/comet2/cmd_ADDL_addl0__z/cmd b/test/system/comet2/cmd_ADDL_addl0__z/cmd
index cbf4e7a..92467db 100755 (executable)
--- a/test/system/comet2/cmd_ADDL_addl0__z/cmd
+++ b/test/system/comet2/cmd_ADDL_addl0__z/cmd
@@ -1,2 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDL/addl0__z.casl
 ../../../../comet2 -td -M8 a.o
+rm -f a.o

diff --git a/test/system/comet2/cmd_ADDL_addl0_ao/Makefile b/test/system/comet2/cmd_ADDL_addl0_ao/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/comet2/cmd_ADDL_addl0_ao/Makefile
+++ b/test/system/comet2/cmd_ADDL_addl0_ao/Makefile
@@ -1,3 +1,2 @@
 include ../Define.mk
-include ../Define_test.mk
 include ../Test.mk

diff --git a/test/system/comet2/cmd_ADDL_addl0_ao/cmd b/test/system/comet2/cmd_ADDL_addl0_ao/cmd
index 532ee45..25717b6 100755 (executable)
--- a/test/system/comet2/cmd_ADDL_addl0_ao/cmd
+++ b/test/system/comet2/cmd_ADDL_addl0_ao/cmd
@@ -1,2 +1,3 @@
 ../../../../casl2 -O ../../../../as/cmd/ADDL/addl0_ao.casl
 ../../../../comet2 -td -M8 a.o
+rm -f a.o

diff --git a/test/system/comet2/cmd_ADDL_addl0_as0/Makefile b/test/system/comet2/cmd_ADDL_addl0_as0/Makefile
index e38b63c..b6dac59 100644 (file)
--- a/test/system/comet2/cmd_ADDL_addl0_as0/Makefile
+++ b/test/system/comet2/cmd_ADDL_addl0_as0/Makefile