X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_utils_parse_time_suffix.cpp;h=765c96fb5d01bb96c7509d1c0f167a3803c4cb8f;hb=8d5a3312b34841f1ecba2605acad3eaca79fd5e4;hp=95aac5561d13edca8091359357c723c24db6a9d7;hpb=740da7d5000ca1ffdcf14bda5096bf7ccfb86bdd;p=lttng-tools.git

diff --git a/tests/unit/test_utils_parse_time_suffix.cpp b/tests/unit/test_utils_parse_time_suffix.cpp
index 95aac5561..765c96fb5 100644
--- 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)
 {
@@ -101,7 +103,7 @@ static void test_utils_parse_time_suffix(void)
 
 		ret = utils_parse_time_suffix(valid_tests_inputs[i].input, &result);
 		sprintf(name, "valid test case: %s expected %" PRIu64, valid_tests_inputs[i].input, result);
-		ok(ret == 0 && result == valid_tests_inputs[i].expected_result, name);
+		ok(ret == 0 && result == valid_tests_inputs[i].expected_result, "%s", name);
 	}
 
 	/* Test invalid cases */
@@ -111,11 +113,11 @@ static void test_utils_parse_time_suffix(void)
 		sprintf(name, "invalid test case: %s", invalid_tests_inputs[i]);
 
 		ret = utils_parse_time_suffix(invalid_tests_inputs[i], &result);
-		ok(ret != 0, name);
+		ok(ret != 0, "%s", name);
 	}
 }
 
-int main(int argc, char **argv)
+int main(void)
 {
 	plan_tests(num_valid_tests + num_invalid_tests);