X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2FMakefile.am;h=98c7473c02b42b7ca3ac9b6f2e3b1cd67135790d;hp=ff68240e854f502c2b951ebe8a6795a7ca4cf25b;hb=11343a4081fe9d8dac4c589c5f559f5c79ec52ba;hpb=7baec44ef2117fa4565bd8e3d85feadb875a4a14

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ff68240e..98c7473c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,10 +1,27 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+SUBDIRS = utils bin lib
 
-noinst_PROGRAMS = test-bitfield
+LOG_DRIVER_FLAGS='--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+	$(top_srcdir)/config/tap-driver.sh
 
-test_bitfield_SOURCES = test-bitfield.c
+TESTS = bin/test_trace_read \
+	bin/test_trace_read \
+	bin/test_packet_seq_num \
+	bin/intersection/test_intersection \
+	lib/test_bitfield \
+	lib/test_seek_empty_packet \
+	lib/test_seek_big_trace \
+	lib/test_ctf_writer_complete
 
-EXTRA_DIST = runall.sh ctf-traces/**
+EXTRA_DIST = $(srcdir)/ctf-traces/** \
+	     $(srcdir)/debug-info-data/** \
+	     $(srcdir)/debug-info-data/.build-id/cd/**
 
-check-am:
-	./runall.sh
+if ENABLE_DEBUG_INFO
+TESTS += lib/test_dwarf_complete \
+	lib/test_bin_info_complete
+endif
+
+if USE_PYTHON
+TESTS += bin/intersection/test_multi_trace_intersection.py
+endif