From: Mathieu Desnoyers Date: Tue, 6 Apr 2021 18:26:03 +0000 (-0400) Subject: Tests: use TRACEPOINT_INCLUDE X-Git-Tag: v2.13.0-rc1~166 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=59eb182b075a03dd716398f019cee0fdcfe47b7b;p=lttng-tools.git 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 Signed-off-by: Jérémie Galarneau Change-Id: Id2bb15062f37878de03656dc5a47d9dd35687b41 --- diff --git a/tests/regression/tools/filtering/tp.h b/tests/regression/tools/filtering/tp.h index d7ac473b6..ce2b6d1e9 100644 --- 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 diff --git a/tests/regression/ust/high-throughput/tp.h b/tests/regression/ust/high-throughput/tp.h index a5be1f779..9c74d8c0a 100644 --- 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 diff --git a/tests/regression/ust/low-throughput/tp.h b/tests/regression/ust/low-throughput/tp.h index 3ec3c40c1..961f2e907 100644 --- 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 diff --git a/tests/regression/ust/multi-session/ust_gen_nevents.h b/tests/regression/ust/multi-session/ust_gen_nevents.h index a4f4067d1..09fb640a9 100644 --- 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 diff --git a/tests/regression/ust/overlap/demo/ust_tests_demo.h b/tests/regression/ust/overlap/demo/ust_tests_demo.h index 23360e701..8c9c89058 100644 --- 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 diff --git a/tests/regression/ust/overlap/demo/ust_tests_demo2.h b/tests/regression/ust/overlap/demo/ust_tests_demo2.h index 9861b0899..a8b30e8a1 100644 --- 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 diff --git a/tests/regression/ust/overlap/demo/ust_tests_demo3.h b/tests/regression/ust/overlap/demo/ust_tests_demo3.h index db41f174c..7511c2dc1 100644 --- 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 diff --git a/tests/utils/testapp/gen-ust-events-ns/tp.h b/tests/utils/testapp/gen-ust-events-ns/tp.h index e0ddb29a6..b9540e53f 100644 --- 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 diff --git a/tests/utils/testapp/gen-ust-events/tp.h b/tests/utils/testapp/gen-ust-events/tp.h index 132f9ba4e..6b12a86ac 100644 --- 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 diff --git a/tests/utils/testapp/gen-ust-nevents-str/tp.h b/tests/utils/testapp/gen-ust-nevents-str/tp.h index 497c25391..b9fe38429 100644 --- 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 diff --git a/tests/utils/testapp/gen-ust-nevents/tp.h b/tests/utils/testapp/gen-ust-nevents/tp.h index 351ce83cc..8b68b374d 100644 --- 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