Fix: sessiond: ODR violation results in memory corruption

[lttng-tools.git] / tests / unit / test_event_rule.cpp

diff --git a/tests/unit/test_event_rule.cpp b/tests/unit/test_event_rule.cpp
index b8adee76906b1256b77a7a9d29c812e83c110689..d7228d0f31f236fc47cac685e547633f3633752f 100644 (file)
--- a/tests/unit/test_event_rule.cpp
+++ b/tests/unit/test_event_rule.cpp
@@ -14,29 +14,29 @@
 
 #include <tap/tap.h>
 
-#include <common/payload-view.h>
-#include <common/payload.h>
+#include <common/payload-view.hpp>
+#include <common/payload.hpp>
 #include <lttng/domain.h>
-#include <lttng/event-rule/jul-logging-internal.h>
+#include <lttng/event-rule/jul-logging-internal.hpp>
 #include <lttng/event-rule/jul-logging.h>
-#include <lttng/event-rule/kernel-kprobe-internal.h>
+#include <lttng/event-rule/kernel-kprobe-internal.hpp>
 #include <lttng/event-rule/kernel-kprobe.h>
-#include <lttng/event-rule/kernel-syscall-internal.h>
+#include <lttng/event-rule/kernel-syscall-internal.hpp>
 #include <lttng/event-rule/kernel-syscall.h>
-#include <lttng/event-rule/python-logging-internal.h>
+#include <lttng/event-rule/python-logging-internal.hpp>
 #include <lttng/event-rule/python-logging.h>
-#include <lttng/event-rule/kernel-tracepoint-internal.h>
+#include <lttng/event-rule/kernel-tracepoint-internal.hpp>
 #include <lttng/event-rule/kernel-tracepoint.h>
-#include <lttng/event-rule/kernel-uprobe-internal.h>
+#include <lttng/event-rule/kernel-uprobe-internal.hpp>
 #include <lttng/event-rule/kernel-uprobe.h>
-#include <lttng/event-rule/user-tracepoint-internal.h>
+#include <lttng/event-rule/user-tracepoint-internal.hpp>
 #include <lttng/event-rule/user-tracepoint.h>
 #include <lttng/event.h>
-#include <lttng/kernel-probe-internal.h>
+#include <lttng/kernel-probe-internal.hpp>
 #include <lttng/kernel-probe.h>
-#include <lttng/userspace-probe-internal.h>
+#include <lttng/userspace-probe-internal.hpp>
 #include <lttng/userspace-probe.h>
-#include "bin/lttng/loglevel.h"
+#include "bin/lttng/loglevel.hpp"
 
 /* For error.h. */
 int lttng_opt_quiet = 1;
@@ -45,10 +45,12 @@ int lttng_opt_mi;
 
 #define NUM_TESTS 212
 
+namespace {
 struct tracepoint_test {
        enum lttng_domain_type type;
        bool support_name_pattern_exclusion;
 };
+} /* namespace */
 
 typedef const char *(*log_level_name_getter)(int log_level);
 
@@ -459,6 +461,7 @@ static void test_event_rule_userspace_probe(void)
        struct lttng_payload payload;
 
        diag("Event rule uprobe.");
+       lttng_payload_init(&payload);
 
        lookup_method = lttng_userspace_probe_location_lookup_method_function_elf_create();
        if (!lookup_method) {