X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=ca41a42f420ef5c0f660ea640e7ae7d50d9fb468;hp=4ecc7a8c86f411af0bab90f21ae0506067da1d55;hb=2463b7879c00298daa79744cdaae82ac061a4ed8;hpb=ae0a823f9f7e1d3800479488a58efc2f92f27d89

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 4ecc7a8c8..ca41a42f4 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -17,14 +17,17 @@ TESTS = test_kernel_data \
 	test_utils_compat_poll \
 	test_string_utils \
 	test_notification \
+	test_event_rule \
 	test_directory_handle \
 	test_relayd_backward_compat_group_by_session \
 	ini_config/test_ini_config \
 	test_fd_tracker \
 	test_uuid \
 	test_buffer_view \
+	test_event_expr_to_bytecode \
 	test_payload \
-	test_unix_socket
+	test_unix_socket \
+	test_kernel_probe
 
 LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
 
@@ -45,7 +48,11 @@ noinst_PROGRAMS = test_uri test_session test_kernel_data \
                   test_fd_tracker test_uuid \
                   test_buffer_view \
                   test_payload \
-                  test_unix_socket
+                  test_unix_socket \
+                  test_kernel_probe \
+                  test_condition \
+		  test_event_expr_to_bytecode \
+                  test_event_rule 
 
 if HAVE_LIBLTTNG_UST_CTL
 noinst_PROGRAMS += test_ust_data
@@ -59,12 +66,13 @@ 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) \
+	 $(top_builddir)/src/bin/lttng-sessiond/action-executor.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/lttng-syscall.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/channel.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/agent.$(OBJEXT) \
@@ -78,6 +86,7 @@ SESSIOND_OBJS = $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(OBJEXT)
 	 $(top_builddir)/src/bin/lttng-sessiond/notification-thread-events.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/event.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/timer.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/trigger-error-accounting.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/snapshot.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/sessiond-config.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/rotate.$(OBJEXT) \
@@ -188,6 +197,14 @@ 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)
+
+# 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
@@ -213,3 +230,11 @@ test_payload_LDADD = $(LIBTAP) $(LIBSESSIOND_COMM) $(LIBCOMMON)
 # unix socket test
 test_unix_socket_SOURCES = test_unix_socket.c
 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)