X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2FMakefile.am;h=c1fc9134268f8aaee3a1e8b76f260b934af7924e;hb=b978006283473456b0e545d1c21de60d3e298dc5;hp=566bdeaf14443fcabcaa6652ad64f8fb4c2c6c6a;hpb=0159fa50ebb4c8ea0e34a24f99bc8f5cda298be4;p=lttng-tools.git

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 566bdeaf1..c1fc91342 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