X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2FMakefile.am;h=a95feee9893c6429364cd83f2733ddd6e3a69a24;hb=b17ed2ad7083d1b0bf45fe3e1bfc4e4ad787aaf3;hp=222635d339d65e434ffe3eab642cc0fa374080d3;hpb=0fd2fd15d3d5cdcd2598ed801b1d1c34d84a4dc3;p=lttng-tools.git

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 222635d33..a95feee98 100644
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-SUBDIRS = tools kernel ust
+SUBDIRS = tools
 
 LOG_DRIVER_FLAGS = --merge --post-script $(top_srcdir)/tests/utils/warn_processes.sh
 LOG_DRIVER = env PGREP='$(PGREP)' AM_TAP_AWK='$(AWK)' $(SHELL) \
@@ -50,6 +50,7 @@ TESTS = tools/base-path/test_ust \
 	tools/notification/test_notification_multi_app \
 	tools/rotation/test_ust \
 	tools/rotation/test_kernel \
+	tools/rotation/test_ust_kernel \
 	tools/rotation/test_save_load_mi \
 	tools/rotation/test_schedule_api \
 	tools/metadata/test_kernel \
@@ -62,7 +63,14 @@ TESTS = tools/base-path/test_ust \
 	tools/trigger/test_list_triggers_cli \
 	tools/trigger/test_remove_trigger_cli \
 	tools/trigger/name/test_trigger_name_backwards_compat \
-	tools/trigger/hidden/test_hidden_trigger
+	tools/trigger/hidden/test_hidden_trigger \
+	tools/context/test_ust.py \
+	tools/client/test_session_commands.py
+
+# Only build kernel tests on Linux.
+if IS_LINUX
+SUBDIRS += kernel
+endif # IS_LINUX
 
 if HAVE_LIBLTTNG_UST_CTL
 SUBDIRS += ust
@@ -80,6 +88,7 @@ TESTS += ust/before-after/test_before_after \
 	ust/blocking/test_blocking \
 	ust/multi-lib/test_multi_lib \
 	ust/rotation-destroy-flush/test_rotation_destroy_flush \
+	ust/ust-constructor/test_ust_constructor.py \
 	tools/metadata/test_ust \
 	tools/relayd-grouping/test_ust \
 	tools/trigger/rate-policy/test_ust_rate_policy
@@ -98,6 +107,19 @@ endif # TEST_JAVA_LOG4J2_AGENT
 
 if IS_LINUX
 TESTS += \
+	kernel/test_all_events \
+	kernel/test_callstack \
+	kernel/test_channel \
+	kernel/test_clock_override \
+	kernel/test_event_basic \
+	kernel/test_kernel_function \
+	kernel/test_lttng_logger \
+	kernel/test_ns_contexts \
+	kernel/test_ns_contexts_change \
+	kernel/test_rotation_destroy_flush \
+	kernel/test_select_poll_epoll \
+	kernel/test_syscall \
+	kernel/test_userspace_probe \
 	ust/namespaces/test_ns_contexts \
 	ust/namespaces/test_ns_contexts_change
 endif # IS_LINUX