Fix: tests: provide channel name when a non-default channel exists

[lttng-tools.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8dd05a4f0cfb646fdf6cc590a7229fdddeaa3df5..6d5b00d9a6da78fc196a4a01f6abc461b8f5219a 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,44 +1,15 @@
-SUBDIRS = .
-
-AM_CFLAGS = -g -Wall
-AM_LDFLAGS = -lurcu -lurcu-cds
-
-EXTRA_DIST = runall.sh utils.sh lttng/runall.sh lttng/run-kernel-tests.sh
-
-noinst_PROGRAMS = test_sessions test_kernel_data_trace \
-                                 kernel_all_events_basic kernel_event_basic
-
-UTILS=utils.h
-SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.c
-KERN_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-kernel.c
-LIBLTTNG=$(top_srcdir)/src/lib/lttng-ctl/lttng-ctl.c \
-                $(top_srcdir)/src/common/sessiond-comm/sessiond-comm.c
-
-test_sessions_SOURCES = test_sessions.c $(UTILS) $(SESSIONS)
-test_sessions_LDADD = $(top_builddir)/src/common/libcommon.la \
-                                         $(top_builddir)/src/common/hashtable/libhashtable.la
-
-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)
-
-if HAVE_LIBLTTNG_UST_CTL
-SUBDIRS += ust-nevents ust-nprocesses
-EXTRA_DIST += lttng/run-ust-global-tests.sh
-noinst_PROGRAMS += ust_global_event_basic ust_global_all_events_basic test_ust_data_trace
-
-UST_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-ust.c
-
-test_ust_data_trace_SOURCES = test_ust_data_trace.c $(UTILS) $(UST_DATA_TRACE)
-test_ust_data_trace_LDADD = $(top_builddir)/src/common/libcommon.la \
-                                                       $(top_builddir)/src/common/hashtable/libhashtable.la
-
-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)
-endif # HAVE_LIBLTTNG_UST_CTL
+SUBDIRS = utils regression unit stress
 
+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
+
+dist_noinst_SCRIPTS = run.sh unit_tests fast_regression long_regression root_regression with_bindings_regression
+EXTRA_DIST = run.sh unit_tests fast_regression long_regression root_regression with_bindings_regression