X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2FMakefile.am;h=c52c3c61491aa1c17ddadde732e8a9df5dedabb1;hp=441354e12df708d979208f02def31437c7773142;hb=434f80687923fbce645b5b31b44876229559808c;hpb=9ac429ef32142eaecfec2d1a44569464c4f8f721

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 441354e12..c52c3c614 100644
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -1,13 +1,57 @@
-SUBDIRS = . tools kernel
+SUBDIRS = tools kernel ust
 
-AM_CFLAGS = -g -Wall
-AM_LDFLAGS = -lurcu -lurcu-cds
+LOG_DRIVER_FLAGS='--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+	$(top_srcdir)/config/tap-driver.sh
 
-EXTRA_DIST = run-report.py test_list.py runall.sh
+TESTS = tools/filtering/test_invalid_filter \
+	tools/filtering/test_unsupported_op \
+	tools/filtering/test_valid_filter \
+	tools/streaming/test_ust \
+	tools/health/test_thread_ok \
+	tools/live/test_ust \
+	tools/live/test_ust_tracefile_count \
+	tools/live/test_lttng_ust \
+	tools/tracefile-limits/test_tracefile_count \
+	tools/tracefile-limits/test_tracefile_size \
+	tools/exclusion/test_exclusion \
+	tools/snapshots/test_ust_fast \
+	tools/snapshots/test_ust_streaming \
+	tools/save-load/test_save \
+	tools/save-load/test_load \
+	tools/mi/test_mi \
+	tools/wildcard/test_event_wildcard \
+	tools/crash/test_crash \
+	tools/regen-metadata/test_ust \
+	tools/regen-statedump/test_ust \
+	tools/notification/test_notification \
+	tools/notification/test_notification_multi_app
 
 if HAVE_LIBLTTNG_UST_CTL
 SUBDIRS += ust
+TESTS += ust/before-after/test_before_after \
+	ust/buffers-pid/test_buffers_pid \
+	ust/multi-session/test_multi_session \
+	ust/nprocesses/test_nprocesses \
+	ust/overlap/test_overlap \
+	ust/java-jul/test_java_jul \
+	ust/java-log4j/test_java_log4j \
+	ust/python-logging/test_python_logging \
+	ust/getcpu-override/test_getcpu_override \
+	ust/clock-override/test_clock_override \
+	ust/test_event_basic \
+	ust/test_event_tracef \
+	ust/test_event_perf \
+	ust/blocking/test_blocking
 endif # HAVE_LIBLTTNG_UST_CTL
 
-check-am:
-	./runall.sh
+if PYTHON_BINDING
+TESTS += ust/linking/test_linking \
+	ust/daemon/test_daemon \
+	ust/exit-fast/test_exit-fast \
+	ust/fork/test_fork \
+	ust/libc-wrapper/test_libc-wrapper \
+	ust/baddr-statedump/test_baddr-statedump \
+	ust/ust-dl/test_ust-dl \
+	ust/type-declarations/test_type_declarations
+endif