null+****@clear*****
null+****@clear*****
2010年 8月 12日 (木) 10:19:25 JST
Kouhei Sutou 2010-08-12 01:19:25 +0000 (Thu, 12 Aug 2010)
New Revision: 9b7cb7184343fa0bd4b75a18c5f878b5be6178a9
Log:
test/unit/story/taiyaki/test-geo.c -> test/unit/story/test-taiyaki.c.
Removed files:
test/unit/story/taiyaki/Makefile.am
Modified files:
configure.ac
test/unit/story/Makefile.am
Renamed files:
test/unit/story/test-taiyaki.c
(from test/unit/story/taiyaki/test-geo.c)
Modified: configure.ac (+0 -1)
===================================================================
--- configure.ac 2010-08-12 01:15:37 +0000 (d2407c5)
+++ configure.ac 2010-08-12 01:19:25 +0000 (7c13b22)
@@ -106,7 +106,6 @@ AC_CONFIG_FILES([Makefile
test/unit/fixtures/performance/Makefile
test/unit/fixtures/modules/Makefile
test/unit/fixtures/story/Makefile
- test/unit/fixtures/story/taiyaki/Makefile
test/unit/util/Makefile
test/unit/core/Makefile
test/unit/memcached/Makefile
Modified: test/unit/story/Makefile.am (+23 -2)
===================================================================
--- test/unit/story/Makefile.am 2010-08-12 01:15:37 +0000 (d330fab)
+++ test/unit/story/Makefile.am 2010-08-12 01:19:25 +0000 (be047b0)
@@ -1,2 +1,23 @@
-SUBDIRS = \
- taiyaki
+if WITH_CUTTER
+noinst_LTLIBRARIES = \
+ test-taiyaki.la
+endif
+
+INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/lib \
+ $(GROONGA_INCLUDEDIR)
+
+AM_CFLAGS = \
+ $(GCUTTER_CFLAGS) \
+ -DGROONGA=\"$(abs_top_builddir)/src/groonga\"
+
+AM_LDFLAGS = -module -rpath $(libdir) -avoid-version
+
+LIBS = \
+ $(top_builddir)/lib/libgroonga.la \
+ $(GCUTTER_LIBS) \
+ $(top_builddir)/test/unit/lib/libgrn-test-utils.la \
+ $(top_builddir)/test/unit/lib/libgrn-test-hash-utils.la
+
+test_taiyaki_la_SOURCES = test-taiyaki.c
Deleted: test/unit/story/taiyaki/Makefile.am (+0 -23) 100644
===================================================================
--- test/unit/story/taiyaki/Makefile.am 2010-08-12 01:15:37 +0000 (f36f034)
+++ /dev/null
@@ -1,23 +0,0 @@
-if WITH_CUTTER
-noinst_LTLIBRARIES = \
- test-geo.la
-endif
-
-INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/lib \
- $(GROONGA_INCLUDEDIR)
-
-AM_CFLAGS = \
- $(GCUTTER_CFLAGS) \
- -DGROONGA=\"$(abs_top_builddir)/src/groonga\"
-
-AM_LDFLAGS = -module -rpath $(libdir) -avoid-version
-
-LIBS = \
- $(top_builddir)/lib/libgroonga.la \
- $(GCUTTER_LIBS) \
- $(top_builddir)/test/unit/lib/libgrn-test-utils.la \
- $(top_builddir)/test/unit/lib/libgrn-test-hash-utils.la
-
-test_geo_la_SOURCES = test-geo.c
Renamed: test/unit/story/test-taiyaki.c (+2 -2) 99%
===================================================================
--- test/unit/story/taiyaki/test-geo.c 2010-08-12 01:15:37 +0000 (3910718)
+++ test/unit/story/test-taiyaki.c 2010-08-12 01:19:25 +0000 (cae8268)
@@ -19,7 +19,7 @@
#include <gcutter.h>
#include <glib/gstdio.h>
-#include "../../lib/grn-assertions.h"
+#include "../lib/grn-assertions.h"
void test_in_circle(void);
void test_in_rectangle(void);
@@ -39,7 +39,7 @@ void
cut_startup(void)
{
tmp_directory = g_build_filename(grn_test_get_tmp_dir(),
- "taiyaki-geo",
+ "taiyaki",
NULL);
}