X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2FMakefile.am;h=a95afa73e16dac810878f8aad28d10f78c96112a;hp=10db1bb6b636b16bde5644c711c36de09cb8b713;hb=eeeb081146ad4d2a71d4481369e88096b851dac1;hpb=8dd3235128d2f304a4058741adb49ca043c2c39b

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 10db1bb6b..a95afa73e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,36 +1,5 @@
-AM_CFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/libkernelctl \
-		  -I$(top_srcdir)/liblttngctl -g -Wall -lurcu -lurcu-cds
-
-EXTRA_DIST = runall.sh lttng/runall.sh lttng/run-kernel-tests.sh lttng/run-ust-tests.sh
-
-noinst_PROGRAMS = test_sessions test_kernel_data_trace test_ust_data_trace \
-				  kernel_all_events_basic kernel_event_basic \
-				  ust_global_event_basic ust_global_all_events_basic
-
-UTILS=utils.h
-SESSIONS=$(top_srcdir)/lttng-sessiond/session.c
-KERN_DATA_TRACE=$(top_srcdir)/lttng-sessiond/trace-kernel.c
-UST_DATA_TRACE=$(top_srcdir)/lttng-sessiond/trace-ust.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_sessions_LDADD = $(top_builddir)/common/libcommon.la \
-					  $(top_builddir)/liblttng-ht/liblttng-ht.la
-
-test_kernel_data_trace_SOURCES = test_kernel_data_trace.c $(UTILS) $(KERN_DATA_TRACE)
-
-test_ust_data_trace_SOURCES = test_ust_data_trace.c $(UTILS) $(UST_DATA_TRACE)
-test_ust_data_trace_LDADD = $(top_builddir)/common/libcommon.la \
-							$(top_builddir)/liblttng-ht/liblttng-ht.la
-
-kernel_all_events_basic_SOURCES = lttng/kernel_all_events_basic.c $(UTILS) $(LIBLTTNG)
-
-kernel_event_basic_SOURCES = lttng/kernel_event_basic.c $(UTILS) $(LIBLTTNG)
-
-ust_global_all_events_basic_SOURCES = lttng/ust_global_all_events_basic.c $(UTILS) $(LIBLTTNG)
-
-ust_global_event_basic_SOURCES = lttng/ust_global_event_basic.c $(UTILS) $(LIBLTTNG)
+SUBDIRS = utils regression unit
 
 check-am:
-	./runall.sh
+	./run.sh unit_tests
+	./run.sh fast_regression