X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=eda9f2351310e0b10886d6ee904eaea847973795;hb=235d06f02f6f0306e432165fdcb11d9a6debd480;hp=47891e90af0945d3accf10f7d3cd0fe1351af031;hpb=71dd417a2b700c2315ef9919104572df1bc83f7a;p=babeltrace.git

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