null+****@clear*****
null+****@clear*****
2011年 11月 7日 (月) 15:22:53 JST
Kouhei Sutou 2011-11-07 06:22:53 +0000 (Mon, 07 Nov 2011)
New Revision: 49c21bfe2115b4bf225f5f4830395f72c01de83a
Log:
[test] ensure generating test/result files.
Modified files:
test/run-sql-test.sh
test/sql/groonga_storage/r/Makefile.am
test/sql/groonga_storage/r/files.am
test/sql/groonga_storage/t/Makefile.am
test/sql/groonga_storage/t/files.am
test/sql/groonga_wrapper/r/Makefile.am
test/sql/groonga_wrapper/r/files.am
test/sql/groonga_wrapper/t/Makefile.am
test/sql/groonga_wrapper/t/files.am
test/sql/update-result-files.sh
test/sql/update-test-files.sh
Modified: test/run-sql-test.sh (+1 -2)
===================================================================
--- test/run-sql-test.sh 2011-11-07 16:03:41 +0000 (d109639)
+++ test/run-sql-test.sh 2011-11-07 06:22:53 +0000 (b538564)
@@ -55,13 +55,12 @@ for test_suite_name in groonga_include $(echo $test_suite_names | sed -e 's/,/ /
fi
done
+make -C ${top_dir} > /dev/null || exit 1
if test -n "${plugins_dir}"; then
make -C ${top_dir} \
install-pluginLTLIBRARIES \
plugindir=${plugins_dir} > /dev/null || \
exit 1
-else
- make -C ${top_dir} > /dev/null || exit 1
fi
(cd "$build_mysql_test_dir" && \
Modified: test/sql/groonga_storage/r/Makefile.am (+2 -0)
===================================================================
--- test/sql/groonga_storage/r/Makefile.am 2011-11-07 16:03:41 +0000 (be9713f)
+++ test/sql/groonga_storage/r/Makefile.am 2011-11-07 06:22:53 +0000 (322695b)
@@ -1,3 +1,5 @@
include $(top_srcdir)/test/sql/groonga_storage/r/files.am
EXTRA_DIST = $(result_files)
+
+BUILT_SOURCES = $(generated_files)
Modified: test/sql/groonga_storage/r/files.am (+4 -0)
===================================================================
--- test/sql/groonga_storage/r/files.am 2011-11-07 16:03:41 +0000 (f82f9db)
+++ test/sql/groonga_storage/r/files.am 2011-11-07 06:22:53 +0000 (383d181)
@@ -65,3 +65,7 @@ result_files = \
update_virtual_column.result \
$(NULL)
+generated_files = \
+ information_schema.result \
+ $(NULL)
+
Modified: test/sql/groonga_storage/t/Makefile.am (+2 -0)
===================================================================
--- test/sql/groonga_storage/t/Makefile.am 2011-11-07 16:03:41 +0000 (269996d)
+++ test/sql/groonga_storage/t/Makefile.am 2011-11-07 06:22:53 +0000 (501418f)
@@ -1,3 +1,5 @@
include $(top_srcdir)/test/sql/groonga_storage/t/files.am
EXTRA_DIST = $(test_files)
+
+BUILT_SOURCES = $(generated_files)
Modified: test/sql/groonga_storage/t/files.am (+3 -0)
===================================================================
--- test/sql/groonga_storage/t/files.am 2011-11-07 16:03:41 +0000 (737e0bf)
+++ test/sql/groonga_storage/t/files.am 2011-11-07 06:22:53 +0000 (cf25d1e)
@@ -65,3 +65,6 @@ test_files = \
update_virtual_column.test \
$(NULL)
+generated_files = \
+ $(NULL)
+
Modified: test/sql/groonga_wrapper/r/Makefile.am (+2 -0)
===================================================================
--- test/sql/groonga_wrapper/r/Makefile.am 2011-11-07 16:03:41 +0000 (c53cee0)
+++ test/sql/groonga_wrapper/r/Makefile.am 2011-11-07 06:22:53 +0000 (12378c8)
@@ -1,3 +1,5 @@
include $(top_srcdir)/test/sql/groonga_wrapper/r/files.am
EXTRA_DIST = $(result_files)
+
+BUILT_SOURCES = $(generated_files)
Modified: test/sql/groonga_wrapper/r/files.am (+3 -0)
===================================================================
--- test/sql/groonga_wrapper/r/files.am 2011-11-07 16:03:41 +0000 (782487f)
+++ test/sql/groonga_wrapper/r/files.am 2011-11-07 06:22:53 +0000 (f15be71)
@@ -31,3 +31,6 @@ result_files = \
update_int.result \
$(NULL)
+generated_files = \
+ $(NULL)
+
Modified: test/sql/groonga_wrapper/t/Makefile.am (+2 -0)
===================================================================
--- test/sql/groonga_wrapper/t/Makefile.am 2011-11-07 16:03:41 +0000 (c525d9f)
+++ test/sql/groonga_wrapper/t/Makefile.am 2011-11-07 06:22:53 +0000 (dc3973a)
@@ -1,3 +1,5 @@
include $(top_srcdir)/test/sql/groonga_wrapper/t/files.am
EXTRA_DIST = $(test_files)
+
+BUILT_SOURCES = $(generated_files)
Modified: test/sql/groonga_wrapper/t/files.am (+3 -0)
===================================================================
--- test/sql/groonga_wrapper/t/files.am 2011-11-07 16:03:41 +0000 (04625e7)
+++ test/sql/groonga_wrapper/t/files.am 2011-11-07 06:22:53 +0000 (a8580e5)
@@ -31,3 +31,6 @@ test_files = \
update_int.test \
$(NULL)
+generated_files = \
+ $(NULL)
+
Modified: test/sql/update-result-files.sh (+4 -0)
===================================================================
--- test/sql/update-result-files.sh 2011-11-07 16:03:41 +0000 (130e380)
+++ test/sql/update-result-files.sh 2011-11-07 06:22:53 +0000 (fde1cc1)
@@ -25,3 +25,7 @@ list_paths()
find . -type f -name '*.result.in') | \
sed -e 's,\./,,' | \
list_paths "result_files"
+
+find . -type f -name '*.result.in' | \
+ sed -e 's,\./,,' -e 's,\.in$,,' | \
+ list_paths "generated_files"
Modified: test/sql/update-test-files.sh (+4 -0)
===================================================================
--- test/sql/update-test-files.sh 2011-11-07 16:03:41 +0000 (baa5a3b)
+++ test/sql/update-test-files.sh 2011-11-07 06:22:53 +0000 (8aadb4b)
@@ -15,3 +15,7 @@ list_paths()
find . -type f -name '*.test' | \
sed -e 's,\./,,' | \
list_paths "test_files"
+
+find . -type f -name '*.test.in' | \
+ sed -e 's,\./,,' -e 's,\.in$,,' | \
+ list_paths "generated_files"