Fix: sessiond: ODR violation results in memory corruption

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

diff --git a/tests/unit/test_utils_parse_time_suffix.cpp b/tests/unit/test_utils_parse_time_suffix.cpp
index 89fab12eb1ed72e3d7235543fa83acb6fbfe8bf6..765c96fb5d01bb96c7509d1c0f167a3803c4cb8f 100644 (file)
--- a/tests/unit/test_utils_parse_time_suffix.cpp
+++ b/tests/unit/test_utils_parse_time_suffix.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Simon Marchi <simon.marchi@polymtl.ca>
+ * Copyright (C) 2015 EfficiOS Inc.
  *
  * SPDX-License-Identifier: GPL-2.0-only
  *
@@ -11,20 +11,21 @@
 
 #include <tap/tap.h>
 
-#include <common/utils.h>
+#include <common/utils.hpp>
 
 /* For error.h */
 int lttng_opt_quiet = 1;
 int lttng_opt_verbose = 3;
 int lttng_opt_mi;
 
+namespace {
 struct valid_test_input {
        const char *input;
        uint64_t expected_result;
 };
 
 /* Valid test cases */
-static struct valid_test_input valid_tests_inputs[] = {
+struct valid_test_input valid_tests_inputs[] = {
                { "0", 0 },
                { "1234", 1234 },
                { "1234us", 1234 },
@@ -52,10 +53,10 @@ static struct valid_test_input valid_tests_inputs[] = {
                { "08", 8 },
                { "0145us", 145 },
 };
-static const int num_valid_tests = sizeof(valid_tests_inputs) / sizeof(valid_tests_inputs[0]);
+const int num_valid_tests = sizeof(valid_tests_inputs) / sizeof(valid_tests_inputs[0]);
 
 /* Invalid test cases */
-static const char *invalid_tests_inputs[] = {
+const char *invalid_tests_inputs[] = {
                "",
                " ",
                "-1",
@@ -87,7 +88,8 @@ static const char *invalid_tests_inputs[] = {
                "12mo",
                "53hi",
 };
-static const int num_invalid_tests = sizeof(invalid_tests_inputs) / sizeof(invalid_tests_inputs[0]);
+const int num_invalid_tests = sizeof(invalid_tests_inputs) / sizeof(invalid_tests_inputs[0]);
+} /* namespace */
 
 static void test_utils_parse_time_suffix(void)
 {
@@ -115,7 +117,7 @@ static void test_utils_parse_time_suffix(void)
        }
 }
 
-int main(int argc, char **argv)
+int main(void)
 {
        plan_tests(num_valid_tests + num_invalid_tests);