tests: Move all tests under json-glib

The test framework should live under the json-glib directory, and not be
spread across the project.

8 files changed, 17 insertions, 78 deletions

diff --git a/Makefile.am b/Makefile.am
index cab1f10..6f40cfd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,12 +5,6 @@ ACLOCAL_AMFLAGS = -I build/autotools
 
 SUBDIRS = build json-glib doc
 
-if ENABLE_GLIB_TEST
-SUBDIRS += tests
-endif
-
-DIST_SUBDIRS = json-glib doc tests build
-
 pcfiles = json-glib-1.0.pc
 
 json-glib-1.0.pc: json-glib.pc
diff --git a/configure.ac b/configure.ac
index d2054de..61e4cd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,8 +180,6 @@ AC_CONFIG_FILES([
         json-glib/json-version.h
         json-glib/tests/Makefile
 
-        tests/Makefile
-
         doc/Makefile
         doc/reference/Makefile
         doc/reference/version.xml
diff --git a/json-glib/tests/Makefile.am b/json-glib/tests/Makefile.am
index defcd2f..fea656d 100644
--- a/json-glib/tests/Makefile.am
+++ b/json-glib/tests/Makefile.am
@@ -3,6 +3,8 @@ include $(top_srcdir)/build/autotools/Makefile.am.silent
 
 NULL =
 
+DISTCLEANFILES =
+
 INCLUDES = \
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/json-glib	\
@@ -10,45 +12,24 @@ INCLUDES = \
 
 AM_CPPFLAGS = $(JSON_DEBUG_CFLAGS) -DTESTS_DATA_DIR=\""$(top_srcdir)/json-glib/tests"\"
 AM_CFLAGS = -g $(JSON_CFLAGS) $(MAINTAINER_CFLAGS)
+LDADD = ../libjson-glib-1.0.la
 
 EXTRA_DIST += stream-load.json
 
-DISTCLEANFILES =
-
 noinst_PROGRAMS = $(TEST_PROGS)
-progs_ldadd = $(JSON_LIBS) \
-	$(top_builddir)/json-glib/libjson-glib-1.0.la
-
-TEST_PROGS             += array-test
-array_test_SOURCES      = array-test.c
-array_test_LDADD        = $(progs_ldadd)
-
-TEST_PROGS             += object-test
-object_test_SOURCES     = object-test.c
-object_test_LDADD       = $(progs_ldadd)
-
-TEST_PROGS             += node-test
-node_test_SOURCES       = node-test.c
-node_test_LDADD         = $(progs_ldadd)
-
-TEST_PROGS             += parser-test
-parser_test_SOURCES     = parser-test.c
-parser_test_LDADD       = $(progs_ldadd)
-
-TEST_PROGS             += generator-test
-generator_test_SOURCES  = generator-test.c
-generator_test_LDADD    = $(progs_ldadd)
-
-TEST_PROGS             += builder-test
-builder_test_SOURCES    = builder-test.c
-builder_test_LDADD      = $(progs_ldadd)
-
-TEST_PROGS             += reader-test
-reader_test_SOURCES     = reader-test.c
-reader_test_LDADD       = $(progs_ldadd)
-
-TEST_PROGS             += gvariant-test
-gvariant_test_SOURCES   = gvariant-test.c
-gvariant_test_LDADD     = $(progs_ldadd)
+TEST_PROGS += \
+	array-test		\
+	object-test		\
+	node-test		\
+	parser-test		\
+	generator-test		\
+	builder-test		\
+	reader-test		\
+	gvariant-test		\
+	boxed			\
+	serialize-simple	\
+	serialize-complex	\
+	serialize-full		\
+	$(NULL)
 
 -include $(top_srcdir)/build/autotools/Makefile.am.gitignore
diff --git a/tests/test-serialize-boxed.c b/json-glib/tests/boxed.c
index deeef13..deeef13 100644
--- a/tests/test-serialize-boxed.c
+++ b/json-glib/tests/boxed.c
diff --git a/tests/test-serialize-complex.c b/json-glib/tests/serialize-complex.c
index f577761..f577761 100644
--- a/tests/test-serialize-complex.c
+++ b/json-glib/tests/serialize-complex.c
diff --git a/tests/test-serialize-full.c b/json-glib/tests/serialize-full.c
index 704fb18..704fb18 100644
--- a/tests/test-serialize-full.c
+++ b/json-glib/tests/serialize-full.c
diff --git a/tests/test-serialize-simple.c b/json-glib/tests/serialize-simple.c
index 42af6fb..42af6fb 100644
--- a/tests/test-serialize-simple.c
+++ b/json-glib/tests/serialize-simple.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index 2775533..0000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-include $(top_srcdir)/build/autotools/Makefile.am.gtest
-include $(top_srcdir)/build/autotools/Makefile.am.silent
-
-NULL =
-
-DISTCLEANFILES =
-
-noinst_PROGRAMS = $(TEST_PROGS)
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/json-glib
-AM_CPPFLAGS = -DJSON_DISABLE_DEPRECATED $(JSON_DEBUG_CFLAGS)
-AM_CFLAGS = $(JSON_CFLAGS) $(MAINTAINER_CFLAGS)
-
-progs_ldadd = $(top_builddir)/json-glib/libjson-glib-1.0.la $(JSON_LIBS)
-
-TESTS_ENVIRONMENT = srcdir=$(srcdir)
-
-TEST_PROGS                    += test-serialize-simple
-test_serialize_simple_SOURCES  = test-serialize-simple.c
-test_serialize_simple_LDADD    = $(progs_ldadd)
-
-TEST_PROGS                     += test-serialize-complex
-test_serialize_complex_SOURCES  = test-serialize-complex.c
-test_serialize_complex_LDADD    = $(progs_ldadd)
-
-TEST_PROGS                   += test-serialize-boxed
-test_serialize_boxed_SOURCES  = test-serialize-boxed.c
-test_serialize_boxed_LDADD    = $(progs_ldadd)
-
-TEST_PROGS                  += test-serialize-full
-test_serialize_full_SOURCES  = test-serialize-full.c
-test_serialize_full_LDADD    = $(progs_ldadd)
-
--include $(top_srcdir)/build/autotools/Makefile.am.gitignore