Move the rest of the tests into the tests subdirectory.

Makefile.am

@@ -39,30 +39,6 @@ libjson_la_SOURCES = \
 	linkhash.c \
 	printbuf.c
 
-check_PROGRAMS = test2 test4 test_parse_int64 test_null test_cast test_parse
-
-test2_SOURCES = test2.c
-test2_LDADD = $(lib_LTLIBRARIES)
-
-test4_SOURCES = test4.c
-test4_LDADD = $(lib_LTLIBRARIES)
-
-test_parse_int64_SOURCES = test_parse_int64.c
-test_parse_int64_LDADD = $(lib_LTLIBRARIES)
-
-test_null_SOURCES = test_null.c
-test_null_LDADD = $(lib_LTLIBRARIES)
-
-test_cast_SOURCES = test_cast.c
-test_cast_LDADD = $(lib_LTLIBRARIES)
-
-test_parse_SOURCES = test_parse.c
-test_parse_LDADD = $(lib_LTLIBRARIES)
-
-TESTS = test2.test test4.test parse_int64.test test_null.test test_cast.test test_parse.test
-EXTRA_DIST += $(TESTS)
-testsubdir=testSubDir
-TESTS_ENVIRONMENT       = top_builddir=$(top_builddir)
 
 distclean-local:
 	-rm -rf $(testsubdir)

tests/Makefile.am

@@ -1,17 +1,25 @@
 
 include ../Makefile.am.inc
 
-#lib_LTLIBRARIES = ../libjson.la
+lib_LTLIBRARIES = $(top_builddir)/libjson.la
 
-#check_PROGRAMS = test1 test2 test4 test_parse_int64 test_null test_cast test_parse
-check_PROGRAMS = test1
+check_PROGRAMS = test1 test2 test4 test_parse_int64 test_null test_cast test_parse
 
-#test1_SOURCES = test1.c
-#test1_LDADD = $(lib_LTLIBRARIES)
-test1_LDADD = $(top_builddir)/libjson.la
+test1_LDADD = $(lib_LTLIBRARIES)
 
-#TESTS = test1.test test2.test test4.test parse_int64.test test_null.test test_cast.test test_parse.test
-TESTS = test1.test
+test2_LDADD = $(lib_LTLIBRARIES)
+
+test4_LDADD = $(lib_LTLIBRARIES)
+
+test_parse_int64_LDADD = $(lib_LTLIBRARIES)
+
+test_null_LDADD = $(lib_LTLIBRARIES)
+
+test_cast_LDADD = $(lib_LTLIBRARIES)
+
+test_parse_LDADD = $(lib_LTLIBRARIES)
+
+TESTS = test1.test test2.test test4.test parse_int64.test test_null.test test_cast.test test_parse.test
 EXTRA_DIST=
 EXTRA_DIST += $(TESTS)
 

test-defs.sh → tests/test-defs.sh

@@ -1,5 +1,4 @@
-
-#! /bin/sh
+#!/bin/sh
 
 # Make sure srcdir is an absolute path.  Supply the variable
 # if it does not exist.  We want to be able to run the tests
@@ -22,6 +21,8 @@ case "$top_builddir" in
     *) top_builddir=`\cd ${top_builddir-..} && pwd` ;;
 esac
 
+top_builddir=${top_builddir}/tests
+
 progname=`echo "$0" | sed 's,^.*/,,'`
 testname=`echo "$progname" | sed 's,-.*$,,'`
 testsubdir=${testsubdir-testSubDir}