X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2FMakefile.am;h=e556223d8d39909f32167d40e5c8e7ceef32c0f3;hb=2d74bedd0990c2ba606a7310063b0885c12aaa8a;hp=58269d15dfb295ec31cb46144ab078782bb6c9b3;hpb=ffd85c6e61897e7dcb5d6926dfbad46928c01aee;p=lttng-tools.git

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 58269d15d..e556223d8 100644
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -54,7 +54,9 @@ TESTS = tools/base-path/test_ust \
 	tools/trigger/test_add_trigger_cli \
 	tools/trigger/test_list_triggers_cli \
 	tools/trigger/test_remove_trigger_cli \
-	tools/trigger/name/test_trigger_name_backwards_compat
+	tools/trigger/name/test_trigger_name_backwards_compat \
+	tools/trigger/hidden/test_hidden_trigger \
+	tools/client/test_bug1373_events_differ_only_by_loglevel
 
 if HAVE_LIBLTTNG_UST_CTL
 SUBDIRS += ust
@@ -63,8 +65,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 \
@@ -78,8 +78,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