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

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 8dc4748a4..ca41a42f4 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -24,6 +24,7 @@ TESTS = test_kernel_data \
 	test_fd_tracker \
 	test_uuid \
 	test_buffer_view \
+	test_event_expr_to_bytecode \
 	test_payload \
 	test_unix_socket \
 	test_kernel_probe
@@ -49,6 +50,8 @@ noinst_PROGRAMS = test_uri test_session test_kernel_data \
                   test_payload \
                   test_unix_socket \
                   test_kernel_probe \
+                  test_condition \
+		  test_event_expr_to_bytecode \
                   test_event_rule 
 
 if HAVE_LIBLTTNG_UST_CTL
@@ -63,9 +66,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) \
@@ -83,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) \
@@ -198,6 +202,10 @@ test_notification_LDADD = $(LIBTAP) $(LIBLTTNG_CTL) $(DL_LIBS)
 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
 test_relayd_backward_compat_group_by_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(RELAYD_OBJS)
@@ -226,3 +234,7 @@ 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)