X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=test%2FMakefile.am;h=86d1614e06a88ed49c42678ca59745cd63022d11;hb=ffbab6fedd86ee1a0c7884d62fa7233ce9d745d2;hp=ed111104f18b95e7ade031676e1ed8c3b0184b8d;hpb=390b0ba633ded8af492d842c0e7e184a355f33a8;p=jansson.git

diff --git a/test/Makefile.am b/test/Makefile.am
index ed11110..86d1614 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,22 +1,10 @@
-DIST_SUBDIRS = testprogs testdata
-SUBDIRS = testprogs
+SUBDIRS = bin suites
+EXTRA_DIST = scripts run-suites
 
-check_PROGRAMS = loadf_dumpf loads_dumps load_file_dump_file
-
-AM_CPPFLAGS = -I$(top_srcdir)/src
-AM_CFLAGS = -Wall -Werror
-LDFLAGS = -static  # for speed and Valgrind
-LDADD = ../src/libjansson.la
-
-TESTS = test-api test-invalid test-valid
-
-EXTRA_DIST = \
-	test-api \
-	test-invalid \
-	test-valid \
-	run-test \
-	json-compare.py \
-	split-testfile.py
+TESTS = run-suites
+TESTS_ENVIRONMENT = \
+	top_srcdir=$(top_srcdir) \
+	top_builddir=$(top_builddir)
 
 clean-local:
-	rm -rf testlogs
+	rm -rf logs