X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=tests%2FMakefile.am;h=5feaca2d3003e6430885a689de44bd69a8b58ba9;hb=bbb85c88c898621b07e71a9ed2073d95a8196418;hp=22d784fbaa0873f9ce03827303ba551e597fa95e;hpb=b79ac29cdef552e0266eb1bae6e95a3ff6f03fab;p=lttng-tools.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 22d784fba..5feaca2d3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,15 +1,12 @@
-AM_CFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/libkernelctl \
-		  -I$(top_srcdir)/liblttngctl -g -Wall
-
-noinst_PROGRAMS = test_sessions test_kernel_data_trace
-
-UTILS=utils.h
-SESSIONS=$(top_srcdir)/ltt-sessiond/session.c
-KERN_DATA_TRACE=$(top_srcdir)/ltt-sessiond/trace.c
-
-test_sessions_SOURCES = test_sessions.c $(UTILS) $(SESSIONS)
-
-test_kernel_data_trace_SOURCES = test_kernel_data_trace.c $(UTILS) $(KERN_DATA_TRACE)
+SUBDIRS = utils regression unit
 
+if USE_PYTHON
+check-am:
+	./run.sh unit_tests
+	./run.sh fast_regression
+	./run.sh with_bindings_regression
+else
 check-am:
-	./runall.sh
+	./run.sh unit_tests
+	./run.sh fast_regression
+endif