ユニットテストを更新

diff --git a/selftest/unittest/.gitignore b/selftest/unittest/.gitignore
index 7320273..384ea98 100644 (file)
--- a/selftest/unittest/.gitignore
+++ b/selftest/unittest/.gitignore
@@ -1,2 +1,3 @@
-1.txt
+*/1.txt
+*/*.log
 *.log

diff --git a/selftest/unittest/Define.mk b/selftest/unittest/Define.mk
index 23af1e7..b4a58e1 120000 (symlink)
--- a/selftest/unittest/Define.mk
+++ b/selftest/unittest/Define.mk
@@ -1 +1 @@
-/home/kazubito/2010_11/autotest.mk/template/Define.mk
\ No newline at end of file
+../../template/Define.mk
\ No newline at end of file

diff --git a/selftest/unittest/Define_group.mk b/selftest/unittest/Define_group.mk
index 7c7f726..aa8100a 120000 (symlink)
--- a/selftest/unittest/Define_group.mk
+++ b/selftest/unittest/Define_group.mk
@@ -1 +1 @@
-/home/kazubito/2010_11/autotest.mk/template/Define_group.mk
\ No newline at end of file
+../../template/Define_group.mk
\ No newline at end of file

diff --git a/selftest/unittest/Define_test.mk b/selftest/unittest/Define_test.mk
index 3608db5..d1df03e 120000 (symlink)
--- a/selftest/unittest/Define_test.mk
+++ b/selftest/unittest/Define_test.mk
@@ -1 +1 @@
-/home/kazubito/2010_11/autotest.mk/template/Define_test.mk
\ No newline at end of file
+../../template/Define_test.mk
\ No newline at end of file

diff --git a/selftest/unittest/Makefile b/selftest/unittest/Makefile
index 96aa0a7..4f4e7b0 120000 (symlink)
--- a/selftest/unittest/Makefile
+++ b/selftest/unittest/Makefile
@@ -1 +1 @@
-/home/kazubito/2010_11/autotest.mk/template/Group.mk
\ No newline at end of file
+../../template/Group.mk
\ No newline at end of file

diff --git a/selftest/unittest/Test.mk b/selftest/unittest/Test.mk
index 0b8d2f2..ada05aa 120000 (symlink)
--- a/selftest/unittest/Test.mk
+++ b/selftest/unittest/Test.mk
@@ -1 +1 @@
-/home/kazubito/2010_11/autotest.mk/template/Test.mk
\ No newline at end of file
+../../template/Test.mk
\ No newline at end of file

diff --git a/selftest/unittest/chk_file_ext/0.txt b/selftest/unittest/chk_file_ext/0.txt
index bee2e5d..260671d 100644 (file)
--- a/selftest/unittest/chk_file_ext/0.txt
+++ b/selftest/unittest/chk_file_ext/0.txt
@@ -1,5 +1,5 @@
 b: not exist
 b/b.txt: not exist
-Makefile:14: *** a exists in /home/kazubito/2010_11/autotest.mk/selftest/unittest/chk_file_ext.  中止.
-Makefile:18: *** a/a.txt exists in /home/kazubito/2010_11/autotest.mk/selftest/unittest/chk_file_ext.  中止.
+Makefile:14: *** a exists in /home/kazubito/2010_12/autotest.mk/selftest/unittest/chk_file_ext.  中止.
+Makefile:18: *** a/a.txt exists in /home/kazubito/2010_12/autotest.mk/selftest/unittest/chk_file_ext.  中止.
 

diff --git a/selftest/unittest/chk_file_notext/0.txt b/selftest/unittest/chk_file_notext/0.txt
deleted file mode 100644 (file)
index ed52560..0000000
--- a/selftest/unittest/chk_file_notext/0.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-a: exist
-a/a.txt: exist
-Makefile:14: *** b not exists in /home/kazubito/2010_11/autotest.mk/selftest/unittest/chk_file_notext.  中止.
-Makefile:18: *** b/b.txt not exists in /home/kazubito/2010_11/autotest.mk/selftest/unittest/chk_file_notext.  中止.
-

diff --git a/selftest/unittest/chk_file_notext/Makefile b/selftest/unittest/chk_file_notext/Makefile
deleted file mode 100644 (file)
index 0def35c..0000000
--- a/selftest/unittest/chk_file_notext/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-include ../Define.mk
-include ../Define_test.mk
-include ../Test.mk
-
-.PHONY: utest utest_err1 utest_err2
-
-utest:
-       @$(call chk_file_notext,a)
-       @$(call chk_file_notext,a/a.txt)
-       @echo "a: exist"
-       @echo "a/a.txt: exist"
-
-utest_err1:
-       @$(call chk_file_notext,b)
-       @echo "b: not exist"
-
-utest_err2:
-       @$(call chk_file_notext,b/b.txt)
-       @echo "b/b.txt: not exist"

diff --git a/selftest/unittest/chk_file_notext/a/a.txt b/selftest/unittest/chk_file_notext/a/a.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/selftest/unittest/chk_file_notext/cmd b/selftest/unittest/chk_file_notext/cmd
deleted file mode 100755 (executable)
index 87d6e26..0000000
--- a/selftest/unittest/chk_file_notext/cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-make -s utest 2>&1
-make -s utest_err1 2>&1
-make -s utest_err2 2>&1
-echo

diff --git a/selftest/unittest/chk_file_notext/desc.txt b/selftest/unittest/chk_file_notext/desc.txt
deleted file mode 100644 (file)
index 6a3833f..0000000
--- a/selftest/unittest/chk_file_notext/desc.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-マクロ chk_file_notext のテスト
-指定されたファイルが実在しない場合、エラー

diff --git a/selftest/unittest/create_dir/0.txt b/selftest/unittest/create_dir/0.txt
index e477aef..468bd1a 100644 (file)
--- a/selftest/unittest/create_dir/0.txt
+++ b/selftest/unittest/create_dir/0.txt
@@ -1,4 +1,4 @@
 atest
 Makefile:15: *** NULL argument.  中止.
-Makefile:12: *** atest exists in /home/kazubito/2010_11/autotest.mk/selftest/unittest/create_dir.  中止.
+Makefile:12: *** atest exists in /home/kazubito/2010_12/autotest.mk/selftest/unittest/create_dir.  中止.
 

diff --git a/selftest/unittest/makefiles_abs/0.txt b/selftest/unittest/makefiles_abs/0.txt
index 7eb4820..b50a9f6 100644 (file)
--- a/selftest/unittest/makefiles_abs/0.txt
+++ b/selftest/unittest/makefiles_abs/0.txt
@@ -1 +1 @@
-/home/kazubito/2010_11/autotest.mk/selftest/unittest/makefiles_abs/Define.mk /home/kazubito/2010_11/autotest.mk/selftest/unittest/makefiles_abs/Define_group.mk /home/kazubito/2010_11/autotest.mk/selftest/unittest/makefiles_abs/Define_test.mk /home/kazubito/2010_11/autotest.mk/selftest/unittest/makefiles_abs/Test.mk
+/home/kazubito/2010_12/autotest.mk/selftest/unittest/makefiles_abs/Define.mk /home/kazubito/2010_12/autotest.mk/selftest/unittest/makefiles_abs/Define_group.mk /home/kazubito/2010_12/autotest.mk/selftest/unittest/makefiles_abs/Define_test.mk /home/kazubito/2010_12/autotest.mk/selftest/unittest/makefiles_abs/Test.mk

diff --git a/selftest/unittest/time_cmd/0.txt b/selftest/unittest/time_cmd/0.txt
deleted file mode 100644 (file)
index 33a0d78..0000000
--- a/selftest/unittest/time_cmd/0.txt
+++ /dev/null
@@ -1 +0,0 @@
-time_cmd: 0:03.00

diff --git a/selftest/unittest/time_cmd/00.txt b/selftest/unittest/time_cmd/00.txt
deleted file mode 100644 (file)
index 33a0d78..0000000
--- a/selftest/unittest/time_cmd/00.txt
+++ /dev/null
@@ -1 +0,0 @@
-time_cmd: 0:03.00

diff --git a/selftest/unittest/time_cmd/Makefile b/selftest/unittest/time_cmd/Makefile
deleted file mode 100644 (file)
index f456e4e..0000000
--- a/selftest/unittest/time_cmd/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-include ../Define.mk
-include ../Define_test.mk
-include ../Test.mk
-
-utest:
-       $(call time_cmd,$(TEST),cmd0,00.txt)

diff --git a/selftest/unittest/time_cmd/cmd b/selftest/unittest/time_cmd/cmd
deleted file mode 100755 (executable)
index 52943b1..0000000
--- a/selftest/unittest/time_cmd/cmd
+++ /dev/null
@@ -1 +0,0 @@
-make -s utest && cat 00.txt

diff --git a/selftest/unittest/time_cmd/cmd0 b/selftest/unittest/time_cmd/cmd0
deleted file mode 100755 (executable)
index 5d8ebd0..0000000
--- a/selftest/unittest/time_cmd/cmd0
+++ /dev/null
@@ -1,2 +0,0 @@
-sleep 3
-expr 2 + 3

diff --git a/selftest/unittest/time_cmd/desc.txt b/selftest/unittest/time_cmd/desc.txt
deleted file mode 100644 (file)
index 423d389..0000000
--- a/selftest/unittest/time_cmd/desc.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-マクロ time_cmd のテスト
-テスト実行の経過時間を、ファイルに出力して表示。
-多くの場合、0:03:00 （3秒）を出力。
-実際の実行時間により、結果が異なる場合がある。