null+****@clear*****
null+****@clear*****
2012年 3月 14日 (水) 16:47:03 JST
Kouhei Sutou 2012-03-14 16:47:03 +0900 (Wed, 14 Mar 2012)
New Revision: 4dbd23a6c00794423187b76407aefe439fc10dd7
Log:
test function: use auto generated file list
Removed files:
test/function/fixture/Makefile.am
test/function/fixture/geo/Makefile.am
test/function/fixture/geo/taiyaki/Makefile.am
test/function/fixture/suggest/Makefile.am
test/function/fixture/suggest/rurema/Makefile.am
test/function/suite/Makefile.am
test/function/suite/geo/Makefile.am
test/function/suite/geo/taiyaki/Makefile.am
Modified files:
configure.ac
test/function/Makefile.am
Modified: configure.ac (+0 -8)
===================================================================
--- configure.ac 2012-03-14 14:30:41 +0900 (1b013df)
+++ configure.ac 2012-03-14 16:47:03 +0900 (314cb52)
@@ -250,14 +250,6 @@ AC_CONFIG_FILES([
test/unit/story/Makefile
test/unit/grntest/Makefile
test/function/Makefile
- test/function/fixture/Makefile
- test/function/fixture/geo/Makefile
- test/function/fixture/geo/taiyaki/Makefile
- test/function/fixture/suggest/Makefile
- test/function/fixture/suggest/rurema/Makefile
- test/function/suite/Makefile
- test/function/suite/geo/Makefile
- test/function/suite/geo/taiyaki/Makefile
test/benchmark/Makefile
test/benchmark/fixtures/Makefile
test/benchmark/fixtures/geo-select/Makefile
Modified: test/function/Makefile.am (+8 -7)
===================================================================
--- test/function/Makefile.am 2012-03-14 14:30:41 +0900 (a076e12)
+++ test/function/Makefile.am 2012-03-14 16:47:03 +0900 (a448fdc)
@@ -1,7 +1,3 @@
-SUBDIRS = \
- fixture \
- suite
-
if WITH_FUNCTION_TEST
TESTS = run-test.sh
endif
@@ -12,8 +8,13 @@ TESTS_ENVIRONMENT = \
GROONGA="$(GROONGA)" \
GROONGA_SUGGEST_CREATE_DATASET="$(GROONGA_SUGGEST_CREATE_DATASET)"
-EXTRA_DIST = \
- run-test.sh
-
update-files:
cd $(srcdir) && ./update-files.sh > files.am
+
+include $(top_srcdir)/test/function/files.am
+
+EXTRA_DIST = \
+ run-test.sh \
+ $(test_files) \
+ $(expected_files) \
+ $(fixture_files)
Deleted: test/function/fixture/Makefile.am (+0 -3) 100644
===================================================================
--- test/function/fixture/Makefile.am 2012-03-14 14:30:41 +0900 (ba2eeca)
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = \
- geo \
- suggest
Deleted: test/function/fixture/geo/Makefile.am (+0 -2) 100644
===================================================================
--- test/function/fixture/geo/Makefile.am 2012-03-14 14:30:41 +0900 (d330fab)
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = \
- taiyaki
Deleted: test/function/fixture/geo/taiyaki/Makefile.am (+0 -7) 100644
===================================================================
--- test/function/fixture/geo/taiyaki/Makefile.am 2012-03-14 14:30:41 +0900 (d8d6271)
+++ /dev/null
@@ -1,7 +0,0 @@
-EXTRA_DIST = \
- init.grn \
- ddl.grn \
- shops.grn \
- areas.grn \
- categories.grn \
- synonyms.grn
Deleted: test/function/fixture/suggest/Makefile.am (+0 -2) 100644
===================================================================
--- test/function/fixture/suggest/Makefile.am 2012-03-14 14:30:41 +0900 (4101346)
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = \
- rurema
Deleted: test/function/fixture/suggest/rurema/Makefile.am (+0 -4) 100644
===================================================================
--- test/function/fixture/suggest/rurema/Makefile.am 2012-03-14 14:30:41 +0900 (e0a34f4)
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRA_DIST = \
- ddl.grn \
- items.grn \
- learn.grn
Deleted: test/function/suite/Makefile.am (+0 -2) 100644
===================================================================
--- test/function/suite/Makefile.am 2012-03-14 14:30:41 +0900 (31b7506)
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = \
- geo
Deleted: test/function/suite/geo/Makefile.am (+0 -2) 100644
===================================================================
--- test/function/suite/geo/Makefile.am 2012-03-14 14:30:41 +0900 (d330fab)
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = \
- taiyaki
Deleted: test/function/suite/geo/taiyaki/Makefile.am (+0 -5) 100644
===================================================================
--- test/function/suite/geo/taiyaki/Makefile.am 2012-03-14 14:30:41 +0900 (79d74e7)
+++ /dev/null
@@ -1,5 +0,0 @@
-EXTRA_DIST = \
- in-circle.test \
- in-circle.expected \
- in-rectangle-long-latitude.test \
- in-rectangle-long-latitude.expected