X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Funit%2Flibcommon%2Ftest_smp.c;h=7180076b7fd5db386746055b5ec932ce5a7ed00f;hb=a616fb4e0a0245ae2cbd4614910480df19aa23d6;hp=8f9a4042ba1aab0b76eb01d5721e3dee3c06b32f;hpb=217babc9b6b5dcc531fb6b8bc5fc6e2906a060be;p=lttng-ust.git

diff --git a/tests/unit/libcommon/test_smp.c b/tests/unit/libcommon/test_smp.c
index 8f9a4042..7180076b 100644
--- a/tests/unit/libcommon/test_smp.c
+++ b/tests/unit/libcommon/test_smp.c
@@ -21,43 +21,43 @@ struct parse_test_data {
 };
 
 static struct parse_test_data parse_test_data[] = {
-	{ "", 0 },
-	{ "abc", 0 },
-	{ ",,,", 0 },
-	{ "--", 0 },
-	{ ",", 0 },
-	{ "-", 0 },
-	{ "2147483647", 0 },
-	{ "18446744073709551615", 0 },
-	{ "0-2147483647", 0 },
-	{ "0-18446744073709551615", 0 },
-	{ "0", 1 },
-	{ "1", 2 },
-	{ "0-1", 2 },
-	{ "1-3", 4 },
-	{ "0,2", 3 },
-	{ "1,2", 3 },
-	{ "0,4-6,127", 128 },
-	{ "0-4095", 4096 },
+	{ "", -1 },
+	{ "abc", -1 },
+	{ ",,,", -1 },
+	{ "--", -1 },
+	{ ",", -1 },
+	{ "-", -1 },
+	{ "2147483647", -1 },
+	{ "18446744073709551615", -1 },
+	{ "0-2147483647", -1 },
+	{ "0-18446744073709551615", -1 },
+	{ "0", 0 },
+	{ "1", 1 },
+	{ "0-1", 1 },
+	{ "1-3", 3 },
+	{ "0,2", 2 },
+	{ "1,2", 2 },
+	{ "0,4-6,127", 127 },
+	{ "0-4095", 4095 },
 
-	{ "\n", 0 },
-	{ "abc\n", 0 },
-	{ ",,,\n", 0 },
-	{ "--\n", 0 },
-	{ ",\n", 0 },
-	{ "-\n", 0 },
-	{ "2147483647\n", 0 },
-	{ "18446744073709551615\n", 0 },
-	{ "0-2147483647\n", 0 },
-	{ "0-18446744073709551615\n", 0 },
-	{ "0\n", 1 },
-	{ "1\n", 2 },
-	{ "0-1\n", 2 },
-	{ "1-3\n", 4 },
-	{ "0,2\n", 3 },
-	{ "1,2\n", 3 },
-	{ "0,4-6,127\n", 128 },
-	{ "0-4095\n", 4096 },
+	{ "\n", -1 },
+	{ "abc\n", -1 },
+	{ ",,,\n", -1 },
+	{ "--\n", -1 },
+	{ ",\n", -1 },
+	{ "-\n", -1 },
+	{ "2147483647\n", -1 },
+	{ "18446744073709551615\n", -1 },
+	{ "0-2147483647\n", -1 },
+	{ "0-18446744073709551615\n", -1 },
+	{ "0\n", 0 },
+	{ "1\n", 1 },
+	{ "0-1\n", 1 },
+	{ "1-3\n", 3 },
+	{ "0,2\n", 2 },
+	{ "1,2\n", 2 },
+	{ "0,4-6,127\n", 127 },
+	{ "0-4095\n", 4095 },
 };
 
 static int parse_test_data_len = sizeof(parse_test_data) / sizeof(parse_test_data[0]);
@@ -71,14 +71,14 @@ int main(void)
 	diag("Testing smp helpers");
 
 	for (i = 0; i < parse_test_data_len; i++) {
-		ret = get_num_possible_cpus_from_mask(parse_test_data[i].buf,
+		ret = get_max_cpuid_from_mask(parse_test_data[i].buf,
 				strlen(parse_test_data[i].buf));
 		ok(ret == parse_test_data[i].expected,
-			"get_num_possible_cpus_from_mask '%s', expected: '%d', result: '%d'",
+			"get_max_cpuid_from_mask '%s', expected: '%d', result: '%d'",
 			parse_test_data[i].buf, parse_test_data[i].expected, ret);
 	}
 
-	ok(num_possible_cpus() > 0, "num_possible_cpus (%d > 0)", num_possible_cpus());
+	ok(get_possible_cpus_array_len() > 0, "get_possible_cpus_array_len (%d > 0)", get_possible_cpus_array_len());
 
 	return exit_status();
 }