X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=test%2FMakefile.am;h=e468d22b81431b7d4e4df52f9b010abe97cacd28;hb=19a606d7361e73ff2f5e0b240c2adb07b35e4273;hp=16c5fd264eb2c03af8d22665adbb4a1b8ba2b3ef;hpb=f41e3809844319feae0033ce84d3acc2c5340e8d;p=jansson.git

diff --git a/test/Makefile.am b/test/Makefile.am
index 16c5fd2..e468d22 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,11 +1,10 @@
-check_PROGRAMS = loadf_dumpf loads_dumps load_file_dump_file
+SUBDIRS = bin suites
+EXTRA_DIST = scripts
 
-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