X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=01e7e82c0fbed2cee4cdcf4e38e6d103ba7a17e4;hp=8dc4748a4eaf265094cac3c92855a74a9f05a941;hb=b7fc068d873bcfc93761f418bfefe8c928c33a59;hpb=dbc20d3ca8514150ede944f364985c571f682c0e

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 8dc4748a4..01e7e82c0 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -8,25 +8,29 @@ LOG_DRIVER_FLAGS='--merge'
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
 	$(top_srcdir)/config/tap-driver.sh
 
-TESTS = test_kernel_data \
-	test_session \
-	test_uri \
-	test_utils_parse_size_suffix \
-	test_utils_parse_time_suffix \
-	test_utils_expand_path \
-	test_utils_compat_poll \
-	test_string_utils \
-	test_notification \
-	test_event_rule \
-	test_directory_handle \
-	test_relayd_backward_compat_group_by_session \
+TESTS = \
 	ini_config/test_ini_config \
-	test_fd_tracker \
-	test_uuid \
 	test_buffer_view \
+	test_directory_handle \
+	test_event_expr_to_bytecode \
+	test_event_rule \
+	test_fd_tracker \
+	test_kernel_data \
+	test_kernel_probe \
+	test_log_level_rule \
+	test_notification \
 	test_payload \
+	test_relayd_backward_compat_group_by_session \
+	test_session \
+	test_string_utils \
 	test_unix_socket \
-	test_kernel_probe
+	test_uri \
+	test_utils_compat_poll \
+	test_utils_compat_pthread \
+	test_utils_expand_path \
+	test_utils_parse_size_suffix \
+	test_utils_parse_time_suffix \
+	test_uuid
 
 LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
 
@@ -39,17 +43,29 @@ LIBRELAYD=$(top_builddir)/src/common/relayd/librelayd.la
 LIBLTTNG_CTL=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
 
 # Define test programs
-noinst_PROGRAMS = test_uri test_session test_kernel_data \
-                  test_utils_parse_size_suffix test_utils_parse_time_suffix \
-                  test_utils_expand_path test_utils_compat_poll \
-                  test_string_utils test_notification test_directory_handle \
-                  test_relayd_backward_compat_group_by_session \
-                  test_fd_tracker test_uuid \
-                  test_buffer_view \
-                  test_payload \
-                  test_unix_socket \
-                  test_kernel_probe \
-                  test_event_rule 
+noinst_PROGRAMS = \
+	test_buffer_view \
+	test_condition \
+	test_directory_handle \
+	test_event_expr_to_bytecode \
+	test_event_rule \
+	test_fd_tracker \
+	test_kernel_data \
+	test_kernel_probe \
+	test_log_level_rule \
+	test_notification \
+	test_payload \
+	test_relayd_backward_compat_group_by_session \
+	test_session \
+	test_string_utils \
+	test_unix_socket \
+	test_uri \
+	test_utils_compat_poll \
+	test_utils_compat_pthread \
+	test_utils_expand_path \
+	test_utils_parse_size_suffix \
+	test_utils_parse_time_suffix \
+	test_uuid
 
 if HAVE_LIBLTTNG_UST_CTL
 noinst_PROGRAMS += test_ust_data
@@ -63,9 +79,9 @@ test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE) $(DL_LIBS)
 # Sessiond objects
 SESSIOND_OBJS = $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/cmd.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/condition-internal.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/save.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/notification-thread-commands.$(OBJEXT) \
-	 $(top_builddir)/src/bin/lttng-sessiond/shm.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/kernel.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/ht-cleanup.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/notification-thread.$(OBJEXT) \
@@ -114,7 +130,7 @@ RELAYD_OBJS = $(top_builddir)/src/bin/lttng-relayd/backward-compatibility-group-
 
 test_session_SOURCES = test_session.c
 test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
-		     $(LIBHASHTABLE) $(DL_LIBS) -lrt -lurcu-common -lurcu \
+		     $(LIBHASHTABLE) $(DL_LIBS) -lrt $(URCU_LIBS) \
 		     $(KMOD_LIBS) \
 		     $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
 		     $(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
@@ -134,7 +150,7 @@ endif
 if HAVE_LIBLTTNG_UST_CTL
 test_ust_data_SOURCES = test_ust_data.c
 test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
-		      $(LIBHASHTABLE) $(DL_LIBS) -lrt -lurcu-common -lurcu \
+		      $(LIBHASHTABLE) $(DL_LIBS) -lrt $(URCU_LIBS) \
 		      $(UST_CTL_LIBS) \
 		      $(KMOD_LIBS) \
 		      $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
@@ -178,6 +194,11 @@ test_utils_compat_poll_SOURCES = test_utils_compat_poll.c
 test_utils_compat_poll_LDADD  = $(LIBTAP) $(LIBHASHTABLE) $(DL_LIBS) \
 		      $(top_builddir)/src/common/compat/libcompat.la $(LIBCOMMON)
 
+# compat_pthread unit test
+test_utils_compat_pthread_SOURCES = test_utils_compat_pthread.c
+test_utils_compat_pthread_LDADD  = $(LIBTAP) \
+		      $(top_builddir)/src/common/compat/libcompat.la $(LIBCOMMON)
+
 # expand_path unit test
 test_utils_expand_path_SOURCES = test_utils_expand_path.c
 test_utils_expand_path_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) $(DL_LIBS)
@@ -193,10 +214,15 @@ test_string_utils_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSTRINGUTILS) $(DL_LIBS)
 # Notification api
 test_notification_SOURCES = test_notification.c
 test_notification_LDADD = $(LIBTAP) $(LIBLTTNG_CTL) $(DL_LIBS)
-#
+
 # Event rule api
 test_event_rule_SOURCES = test_event_rule.c
-test_event_rule_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS)
+test_event_rule_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS) \
+		      $(top_builddir)/src/bin/lttng/lttng-loglevel.$(OBJEXT)
+
+# Condition api
+test_condition_SOURCES = test_condition.c
+test_condition_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS)
 
 # relayd backward compat for groou-by-session utilities
 test_relayd_backward_compat_group_by_session_SOURCES = test_relayd_backward_compat_group_by_session.c
@@ -205,7 +231,7 @@ test_relayd_backward_compat_group_by_session_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_s
 
 # fd tracker unit test
 test_fd_tracker_SOURCES = test_fd_tracker.c
-test_fd_tracker_LDADD = $(LIBTAP) $(LIBFDTRACKER) $(DL_LIBS) -lurcu $(LIBCOMMON) $(LIBHASHTABLE)
+test_fd_tracker_LDADD = $(LIBTAP) $(LIBFDTRACKER) $(DL_LIBS) $(URCU_LIBS) $(LIBCOMMON) $(LIBHASHTABLE)
 
 # uuid unit test
 test_uuid_SOURCES = test_uuid.c
@@ -226,3 +252,11 @@ test_unix_socket_LDADD = $(LIBTAP) $(LIBSESSIOND_COMM) $(LIBCOMMON)
 # Kernel probe location api test
 test_kernel_probe_SOURCES = test_kernel_probe.c
 test_kernel_probe_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS)
+#
+# Event expression to bytecode test
+test_event_expr_to_bytecode_SOURCES = test_event_expr_to_bytecode.c
+test_event_expr_to_bytecode_LDADD = $(LIBTAP) $(LIBLTTNG_CTL) $(LIBCOMMON)
+
+# Log level rule api
+test_log_level_rule_SOURCES = test_log_level_rule.c
+test_log_level_rule_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS)