X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2FMakefile.am;h=477ee9735a5545c6cf7bfc96ab03c5c1f8571c5e;hb=6f7eb8e1cb829926bcbce2aeb885b0db63fc7af0;hp=2aa5de8341a36c2b8aa07af0237326b40eab73aa;hpb=c146266cae7ab1b542d697599097da3bffb19175;p=lttng-tools.git

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 2aa5de834..477ee9735 100644
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -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 \
@@ -71,8 +72,6 @@ TESTS += ust/before-after/test_before_after \
 	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 \
@@ -86,8 +85,33 @@ TESTS += ust/before-after/test_before_after \
 	tools/relayd-grouping/test_ust \
 	tools/trigger/rate-policy/test_ust_rate_policy
 
+if TEST_JAVA_JUL_AGENT
+TESTS += ust/java-jul/test_java_jul
+endif # TEST_JAVA_JUL_AGENT
+
+if TEST_JAVA_LOG4J_AGENT
+TESTS += ust/java-log4j/test_java_log4j
+endif # TEST_JAVA_LOG4J_AGENT
+
+if TEST_JAVA_LOG4J2_AGENT
+TESTS += ust/java-log4j2/test_agent_log4j2_domain_log4j
+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