X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=test%2FMakefile.am;h=86d1614e06a88ed49c42678ca59745cd63022d11;hb=72e39484383c3a628d350b64c6f83db81ee86a0c;hp=865b1e94c9599aef42aef9c855ef9eb3c4f79d74;hpb=f60c563bab0388ee0ee74571ef0e2abf641685a8;p=jansson.git

diff --git a/test/Makefile.am b/test/Makefile.am
index 865b1e9..86d1614 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,11 +1,10 @@
-check_PROGRAMS = load_dump loadf_dumpf loads_dumps
+SUBDIRS = bin suites
+EXTRA_DIST = scripts run-suites
 
-AM_CPPFLAGS = -I$(top_srcdir)/src
-AM_CFLAGS = -Wall -Werror
-LDFLAGS = -static  # for speed and Valgrind
-LDADD = ../src/libjansson.la
-
-TESTS = test-invalid test-valid
+TESTS = run-suites
+TESTS_ENVIRONMENT = \
+	top_srcdir=$(top_srcdir) \
+	top_builddir=$(top_builddir)
 
 clean-local:
-	rm -rf testlogs
+	rm -rf logs