Tests: use TRACEPOINT_INCLUDE

The macro TRACEPOINT_INCLUDE_FILE is deprecated since LTTng-UST 2.1. In
preparation for LTTng-UST 2.13, this compatibility macro is finally
removed.

The tests in lttng-tools need to keep up with times and start using its
replacement: TRACEPOINT_INCLUDE.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Id2bb15062f37878de03656dc5a47d9dd35687b41

diff --git a/tests/regression/tools/filtering/tp.h b/tests/regression/tools/filtering/tp.h
index d7ac473b6f7cd9935ff17739c77fd7f16a1e163f..ce2b6d1e9498f24a0f76c4c3a6c643805178cca1 100644 (file)
--- a/tests/regression/tools/filtering/tp.h
+++ b/tests/regression/tools/filtering/tp.h
@@ -40,8 +40,8 @@ TRACEPOINT_EVENT(tp, tptest,
 
 #endif /* _TRACEPOINT_TP_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./tp.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./tp.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/tests/regression/ust/high-throughput/tp.h b/tests/regression/ust/high-throughput/tp.h
index a5be1f779ca3da86e29f5660e97523f1f8937f58..9c74d8c0aabf856b794d94e4fbf145fb90af11bd 100644 (file)
--- a/tests/regression/ust/high-throughput/tp.h
+++ b/tests/regression/ust/high-throughput/tp.h
@@ -34,8 +34,8 @@ TRACEPOINT_EVENT(tp, tptest,
 
 #endif /* _TRACEPOINT_TP_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./tp.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./tp.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/tests/regression/ust/low-throughput/tp.h b/tests/regression/ust/low-throughput/tp.h
index 3ec3c40c199b0918607a68e8d64a5652e698b0d3..961f2e907c64acb2655200ab6a4655296605f2cb 100644 (file)
--- a/tests/regression/ust/low-throughput/tp.h
+++ b/tests/regression/ust/low-throughput/tp.h
@@ -23,8 +23,8 @@ TRACEPOINT_EVENT(tp, slow,
 
 #endif /* _TRACEPOINT_TP_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./tp.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./tp.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/tests/regression/ust/multi-session/ust_gen_nevents.h b/tests/regression/ust/multi-session/ust_gen_nevents.h
index a4f4067d17f3f94f8dac03d7307ca312f1b26bd9..09fb640a9076c8a585aa08ca7415627ff35eb4cf 100644 (file)
--- a/tests/regression/ust/multi-session/ust_gen_nevents.h
+++ b/tests/regression/ust/multi-session/ust_gen_nevents.h
@@ -47,8 +47,8 @@ TRACEPOINT_EVENT(ust_gen_nevents, tptest3,
 
 #endif /* _TRACEPOINT_UST_GEN_NEVENTS_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./ust_gen_nevents.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./ust_gen_nevents.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/tests/regression/ust/overlap/demo/ust_tests_demo.h b/tests/regression/ust/overlap/demo/ust_tests_demo.h
index 23360e70177128e8041dab3138b95af8fe3aa7f1..8c9c89058be1398064c9b2f8c2ee8880895dfa90 100644 (file)
--- a/tests/regression/ust/overlap/demo/ust_tests_demo.h
+++ b/tests/regression/ust/overlap/demo/ust_tests_demo.h
@@ -41,8 +41,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/regression/ust/overlap/demo/ust_tests_demo2.h b/tests/regression/ust/overlap/demo/ust_tests_demo2.h
index 9861b0899d7290d09b753129e0429ef3627c0b46..a8b30e8a11997453ffbb47a986547f12ae17fa88 100644 (file)
--- a/tests/regression/ust/overlap/demo/ust_tests_demo2.h
+++ b/tests/regression/ust/overlap/demo/ust_tests_demo2.h
@@ -37,8 +37,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/regression/ust/overlap/demo/ust_tests_demo3.h b/tests/regression/ust/overlap/demo/ust_tests_demo3.h
index db41f174cb98d1e2b9c367c746b3c47752774b45..7511c2dc175318431a88d21b2eac982e71c12e35 100644 (file)
--- a/tests/regression/ust/overlap/demo/ust_tests_demo3.h
+++ b/tests/regression/ust/overlap/demo/ust_tests_demo3.h
@@ -23,8 +23,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/utils/testapp/gen-ust-events-ns/tp.h b/tests/utils/testapp/gen-ust-events-ns/tp.h
index e0ddb29a601f6e42215527b74fa109bb9e3a6b78..b9540e53f6918cc1c222151cb82c12bd6f5dcab5 100644 (file)
--- a/tests/utils/testapp/gen-ust-events-ns/tp.h
+++ b/tests/utils/testapp/gen-ust-events-ns/tp.h
@@ -23,8 +23,8 @@ TRACEPOINT_EVENT(tp, tptest,
 
 #endif /* _TRACEPOINT_TP_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./tp.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./tp.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/tests/utils/testapp/gen-ust-events/tp.h b/tests/utils/testapp/gen-ust-events/tp.h
index 132f9ba4eb03930e0d732d2c29ffbdcae06853bc..6b12a86ac7cc0bd3e4ee41ac316ce656750c77a1 100644 (file)
--- a/tests/utils/testapp/gen-ust-events/tp.h
+++ b/tests/utils/testapp/gen-ust-events/tp.h
@@ -62,8 +62,8 @@ TRACEPOINT_EVENT(tp, tptest,
 
 #endif /* _TRACEPOINT_TP_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./tp.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./tp.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/tests/utils/testapp/gen-ust-nevents-str/tp.h b/tests/utils/testapp/gen-ust-nevents-str/tp.h
index 497c25391887d2346c74e6f0d7c20d3843b4ba25..b9fe384297ad9ee45450fa9c0b0b1cc4881e62f5 100644 (file)
--- a/tests/utils/testapp/gen-ust-nevents-str/tp.h
+++ b/tests/utils/testapp/gen-ust-nevents-str/tp.h
@@ -28,8 +28,8 @@ TRACEPOINT_EVENT(tp, the_string,
 
 #endif /* _TRACEPOINT_TP_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./tp.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./tp.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/tests/utils/testapp/gen-ust-nevents/tp.h b/tests/utils/testapp/gen-ust-nevents/tp.h
index 351ce83cc9889ed8dde3f5316d9d890571786828..8b68b374df1ed38adc4e26965ce90808a69f6d2f 100644 (file)
--- a/tests/utils/testapp/gen-ust-nevents/tp.h
+++ b/tests/utils/testapp/gen-ust-nevents/tp.h
@@ -111,8 +111,8 @@ TRACEPOINT_EVENT(tp, tptest5,
 
 #endif /* _TRACEPOINT_TP_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./tp.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./tp.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>