[json-glib] tests: Move Parser and Generator tests

[Emmanuele Bassi <ebassi src gnome org>]

commit e32a157f97d96293f6f4061e7d0008d90ff16258
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Tue Dec 29 22:59:13 2009 +0000

    tests: Move Parser and Generator tests
    
    Use the json-glib/tests directory for testing the data structures of
    JSON-GLib: node, object, array, parser and generator.
    
    The tests/ directory should be used for complex test cases, like the
    GObject and GBoxed integration - but the goal is to remove the top-level
    tests/ directory altogether, since the conformance test suite should be
    built along the json-glib/ directory.

 json-glib/tests/Makefile.am                        |   26 +++++++++++++-------
 .../tests/generator-test.c                         |    0
 .../test-parser.c => json-glib/tests/parser-test.c |    0
 tests/Makefile.am                                  |    8 ------
 4 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/json-glib/tests/Makefile.am b/json-glib/tests/Makefile.am
index d26f085..3602e82 100644
--- a/json-glib/tests/Makefile.am
+++ b/json-glib/tests/Makefile.am
@@ -14,15 +14,23 @@ AM_CFLAGS = -g $(JSON_CFLAGS)
 noinst_PROGRAMS = $(TEST_PROGS)
 progs_ldadd = $(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             += 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             += 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             += 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)
 
diff --git a/tests/test-generator.c b/json-glib/tests/generator-test.c
similarity index 100%
rename from tests/test-generator.c
rename to json-glib/tests/generator-test.c
diff --git a/tests/test-parser.c b/json-glib/tests/parser-test.c
similarity index 100%
rename from tests/test-parser.c
rename to json-glib/tests/parser-test.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e9a0467..b862551 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,14 +11,6 @@ progs_ldadd = $(top_builddir)/json-glib/libjson-glib-1.0.la $(JSON_LIBS)
 
 TESTS_ENVIRONMENT = srcdir=$(srcdir)
 
-TEST_PROGS          += test-parser
-test_parser_SOURCES  = test-parser.c
-test_parser_LDADD    = $(progs_ldadd)
-
-TEST_PROGS             += test-generator
-test_generator_SOURCES  = test-generator.c
-test_generator_LDADD    = $(progs_ldadd)
-
 TEST_PROGS                    += test-serialize-simple
 test_serialize_simple_SOURCES  = test-serialize-simple.c
 test_serialize_simple_LDADD    = $(progs_ldadd)