X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=5feaca2d3003e6430885a689de44bd69a8b58ba9;hb=bbb85c88c898621b07e71a9ed2073d95a8196418;hp=a10390614ca5bc9f872d234f4739b4a93224658d;hpb=c60ddab68a253f696908ed3766207b8443b85982;p=lttng-tools.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a10390614..5feaca2d3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,24 +1,12 @@
-AM_CFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/libkernelctl \
-		  -I$(top_srcdir)/liblttngctl -g -Wall
-
-EXTRA_DIST = runall.sh lttng/runall.sh
-
-noinst_PROGRAMS = test_sessions test_kernel_data_trace kernel_all_events_basic \
-				  kernel_event_basic
-
-UTILS=utils.h
-SESSIONS=$(top_srcdir)/ltt-sessiond/session.c
-KERN_DATA_TRACE=$(top_srcdir)/ltt-sessiond/trace.c
-LIBLTTNG=$(top_srcdir)/liblttngctl/lttngctl.c \
-		 $(top_srcdir)/liblttng-sessiond-comm/lttng-sessiond-comm.c
-
-test_sessions_SOURCES = test_sessions.c $(UTILS) $(SESSIONS)
-
-test_kernel_data_trace_SOURCES = test_kernel_data_trace.c $(UTILS) $(KERN_DATA_TRACE)
-
-kernel_all_events_basic_SOURCES = lttng/kernel_all_events_basic.c $(UTILS) $(LIBLTTNG)
-
-kernel_event_basic_SOURCES = lttng/kernel_event_basic.c $(UTILS) $(LIBLTTNG)
+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