From: David Goulet <dgoulet@efficios.com>
Date: Mon, 16 Jan 2012 18:12:02 +0000 (-0500)
Subject: Add UST validation test for data structure
X-Git-Tag: v2.0-pre17~11
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=8dd3235128d2f304a4058741adb49ca043c2c39b

Add UST validation test for data structure

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/.gitignore b/.gitignore
index 3d6f5a3b9..d7e624f6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@ lttng-consumerd/lttng-consumerd
 
 tests/test_sessions
 tests/test_kernel_data_trace
+tests/test_ust_data_trace
 tests/kernel_all_events_basic
 tests/kernel_event_basic
 tests/ust_global_all_events_basic
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 77bed35ca..10db1bb6b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,20 +3,27 @@ AM_CFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/libkernelctl \
 
 EXTRA_DIST = runall.sh lttng/runall.sh lttng/run-kernel-tests.sh lttng/run-ust-tests.sh
 
-noinst_PROGRAMS = test_sessions test_kernel_data_trace kernel_all_events_basic \
-				  kernel_event_basic ust_global_event_basic ust_global_all_events_basic
+noinst_PROGRAMS = test_sessions test_kernel_data_trace test_ust_data_trace \
+				  kernel_all_events_basic kernel_event_basic \
+				  ust_global_event_basic ust_global_all_events_basic
 
 UTILS=utils.h
 SESSIONS=$(top_srcdir)/lttng-sessiond/session.c
 KERN_DATA_TRACE=$(top_srcdir)/lttng-sessiond/trace-kernel.c
+UST_DATA_TRACE=$(top_srcdir)/lttng-sessiond/trace-ust.c
 LIBLTTNG=$(top_srcdir)/liblttngctl/lttngctl.c \
 		 $(top_srcdir)/liblttng-sessiond-comm/lttng-sessiond-comm.c
 
 test_sessions_SOURCES = test_sessions.c $(UTILS) $(SESSIONS)
-test_sessions_LDADD = $(top_builddir)/common/libcommon.la
+test_sessions_LDADD = $(top_builddir)/common/libcommon.la \
+					  $(top_builddir)/liblttng-ht/liblttng-ht.la
 
 test_kernel_data_trace_SOURCES = test_kernel_data_trace.c $(UTILS) $(KERN_DATA_TRACE)
 
+test_ust_data_trace_SOURCES = test_ust_data_trace.c $(UTILS) $(UST_DATA_TRACE)
+test_ust_data_trace_LDADD = $(top_builddir)/common/libcommon.la \
+							$(top_builddir)/liblttng-ht/liblttng-ht.la
+
 kernel_all_events_basic_SOURCES = lttng/kernel_all_events_basic.c $(UTILS) $(LIBLTTNG)
 
 kernel_event_basic_SOURCES = lttng/kernel_event_basic.c $(UTILS) $(LIBLTTNG)
diff --git a/tests/runall.sh b/tests/runall.sh
index 8abc4aaa1..ec6fb3928 100755
--- a/tests/runall.sh
+++ b/tests/runall.sh
@@ -19,7 +19,7 @@
 
 #### ADD TESTS HERE ####
 
-test_suite=( test_sessions test_kernel_data_trace lttng/runall.sh )
+test_suite=( test_sessions test_kernel_data_trace test_ust_data_trace lttng/runall.sh )
 
 #### END TESTS HERE ####