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

diff --git a/test/Makefile.am b/test/Makefile.am
index eedf8de..86d1614 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,13 +1,10 @@
-check_PROGRAMS = \
-	loadf_dumpf loads_dumps load_file_dump_file \
-	testprogs/test_array testprogs/test_number testprogs/test_object
+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-api 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