From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 17 Dec 2012 20:46:11 +0000 (-0500)
Subject: Adapt tests to TRACEPOINT_INCLUDE
X-Git-Tag: v2.1.0~9
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=9a6b7d221c9aa2538a56b54dc6a90c6d41efafda;p=lttng-ust.git

Adapt tests to TRACEPOINT_INCLUDE

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/tests/daemon/ust_tests_daemon.h b/tests/daemon/ust_tests_daemon.h
index 383abdd0..9061c40a 100644
--- a/tests/daemon/ust_tests_daemon.h
+++ b/tests/daemon/ust_tests_daemon.h
@@ -48,8 +48,8 @@ TRACEPOINT_EVENT(ust_tests_daemon, after_daemon_parent,
 
 #endif /* _TRACEPOINT_UST_TESTS_DAEMON_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./ust_tests_daemon.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./ust_tests_daemon.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
diff --git a/tests/demo/ust_tests_demo.h b/tests/demo/ust_tests_demo.h
index ca636b94..b27d5399 100644
--- a/tests/demo/ust_tests_demo.h
+++ b/tests/demo/ust_tests_demo.h
@@ -60,8 +60,8 @@ TRACEPOINT_MODEL_EMF_URI(ust_tests_demo, done,
 
 #endif /* _TRACEPOINT_UST_TESTS_DEMO_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./ust_tests_demo.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./ust_tests_demo.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
diff --git a/tests/demo/ust_tests_demo2.h b/tests/demo/ust_tests_demo2.h
index f3281bb6..25d42ad1 100644
--- a/tests/demo/ust_tests_demo2.h
+++ b/tests/demo/ust_tests_demo2.h
@@ -57,8 +57,8 @@ TRACEPOINT_LOGLEVEL(ust_tests_demo2, loop, TRACE_WARNING)
 
 #endif /* _TRACEPOINT_UST_TESTS_DEMO2_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./ust_tests_demo2.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./ust_tests_demo2.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
diff --git a/tests/demo/ust_tests_demo3.h b/tests/demo/ust_tests_demo3.h
index d1b58a0b..c7b63dd8 100644
--- a/tests/demo/ust_tests_demo3.h
+++ b/tests/demo/ust_tests_demo3.h
@@ -42,8 +42,8 @@ TRACEPOINT_LOGLEVEL(ust_tests_demo3, done, TRACE_WARNING)
 
 #endif /* _TRACEPOINT_UST_TESTS_DEMO3_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./ust_tests_demo3.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./ust_tests_demo3.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
diff --git a/tests/fork/ust_tests_fork.h b/tests/fork/ust_tests_fork.h
index 0fc7036f..b8aeb40a 100644
--- a/tests/fork/ust_tests_fork.h
+++ b/tests/fork/ust_tests_fork.h
@@ -53,8 +53,8 @@ TRACEPOINT_EVENT(ust_tests_fork, after_exec,
 
 #endif /* _TRACEPOINT_UST_TESTS_FORK_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./ust_tests_fork.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./ust_tests_fork.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
diff --git a/tests/hello-static-lib/ust_tests_hello.h b/tests/hello-static-lib/ust_tests_hello.h
index c81bb614..35ea5f5d 100644
--- a/tests/hello-static-lib/ust_tests_hello.h
+++ b/tests/hello-static-lib/ust_tests_hello.h
@@ -61,8 +61,8 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./ust_tests_hello.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./ust_tests_hello.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
diff --git a/tests/hello.cxx/ust_tests_hello.h b/tests/hello.cxx/ust_tests_hello.h
index 9cd2cce4..e783feca 100644
--- a/tests/hello.cxx/ust_tests_hello.h
+++ b/tests/hello.cxx/ust_tests_hello.h
@@ -57,8 +57,8 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./ust_tests_hello.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./ust_tests_hello.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
diff --git a/tests/hello/ust_tests_hello.h b/tests/hello/ust_tests_hello.h
index 7b6b7870..88f1a7f5 100644
--- a/tests/hello/ust_tests_hello.h
+++ b/tests/hello/ust_tests_hello.h
@@ -65,8 +65,8 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./ust_tests_hello.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./ust_tests_hello.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>