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 383abdd06ed1dd3ca2f86daa8485211ad0ba6e63..9061c40a3224ff57a31d239164a17d71fff1cf62 100644 (file)
--- 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 ca636b94b2ced71e541e0269d1363d5c17ad49e7..b27d5399a684b9e48780b5743b51d4529b33233e 100644 (file)
--- 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 f3281bb6d4146da2af6fa224dc7ea83f1a09ed2f..25d42ad18eea0cdf19c96a508a0c2a666b051fe4 100644 (file)
--- 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 d1b58a0b08f340ab35c14484fdcc030798c53cad..c7b63dd8b2750c7d995b9853ea611e482d855b49 100644 (file)
--- 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 0fc7036f28020c34b3ec49355cf41570405a81fc..b8aeb40af1090b57018617becca0be676b66c848 100644 (file)
--- 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 c81bb61443313e9f59379788e397ce6e205d232d..35ea5f5df863d49d32b3eb3e8bf87ec263db872e 100644 (file)
--- 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 9cd2cce4c490b38123c21f47a71135a1eb28f5d9..e783feca7f1b24763ecb24582a279897c623629d 100644 (file)
--- 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 7b6b787083a743b997ab24d16fad0b9d616e5224..88f1a7f578cbf8fcc4a912ac42f100c20e74acfa 100644 (file)
--- 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>