X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_uri.c;h=723bc2c1f2ebcc46716d8cabb63d49d9de0366b3;hp=ba0baf9b6e03b0f1f84ef4d763751b3943a7aa95;hb=ae0a823f9f7e1d3800479488a58efc2f92f27d89;hpb=e3bef7256ce348cf232ede3f36721e661cfda2a7 diff --git a/tests/unit/test_uri.c b/tests/unit/test_uri.c index ba0baf9b6..723bc2c1f 100644 --- a/tests/unit/test_uri.c +++ b/tests/unit/test_uri.c @@ -1,18 +1,8 @@ /* - * Copyright (C) - 2012 David Goulet + * Copyright (C) 2012 David Goulet * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by as - * published by the Free Software Foundation; only version 2 of the License. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include @@ -22,14 +12,15 @@ #include -/* For lttngerr.h */ +/* For error.h */ int lttng_opt_quiet = 1; int lttng_opt_verbose = 3; +int lttng_opt_mi; /* Number of TAP tests in this file */ #define NUM_TESTS 11 -void test_uri_parsing(void) +static void test_uri_parsing(void) { ssize_t size; const char *s_uri1; @@ -74,7 +65,7 @@ void test_uri_parsing(void) uri[1].utype == LTTNG_URI_DST && uri[1].stype == 0 && uri[1].port == 4242 && - strcmp(uri[0].subdir, "my/test/path") == 0 && + strlen(uri[1].subdir) == 0 && strcmp(uri[1].dst.ipv4, "127.0.0.1") == 0, "URI set to net://localhost:8989:4242/my/test/path"); @@ -92,7 +83,7 @@ void test_uri_parsing(void) uri[0].utype == LTTNG_URI_DST && uri[0].stype == 0 && uri[0].port == 8989 && - strlen(uri[1].subdir) == 0 && + strlen(uri[0].subdir) == 0 && strcmp(uri[0].dst.ipv4, "127.0.0.1") == 0 && uri[1].dtype == LTTNG_DST_IPV4 && uri[1].utype == LTTNG_URI_DST && @@ -107,7 +98,7 @@ void test_uri_parsing(void) uri = NULL; } - s_uri1 = "net6://localhost:8989"; + s_uri1 = "net6://[::1]:8989"; size = uri_parse(s_uri1, &uri); @@ -116,15 +107,15 @@ void test_uri_parsing(void) uri[0].utype == LTTNG_URI_DST && uri[0].stype == 0 && uri[0].port == 8989 && - strlen(uri[1].subdir) == 0 && + strlen(uri[0].subdir) == 0 && strcmp(uri[0].dst.ipv6, "::1") == 0 && uri[1].dtype == LTTNG_DST_IPV6 && uri[1].utype == LTTNG_URI_DST && uri[1].stype == 0 && uri[1].port == 0 && strlen(uri[1].subdir) == 0 && - strcmp(uri[0].dst.ipv6, "::1") == 0, - "URI set to net6://localhost:8989"); + strcmp(uri[1].dst.ipv6, "::1") == 0, + "URI set to net6://[::1]:8989"); if (uri) { uri_free(uri); @@ -189,13 +180,15 @@ void test_uri_parsing(void) s_uri1 = "file/my/test/path"; size = uri_parse(s_uri1, &uri); ok(size == -1, "Bad URI set to file/my/test/path"); + assert(!uri); s_uri1 = "net://:8999"; size = uri_parse(s_uri1, &uri); ok(size == -1, "Bad URI set to net://:8999"); + assert(!uri); } -void test_uri_cmp() +static void test_uri_cmp() { struct lttng_uri *uri1, *uri2; const char *s_uri1 = "net://localhost"; @@ -227,7 +220,7 @@ void test_uri_cmp() assert(uri2[0].utype == LTTNG_URI_DST); assert(uri2[0].stype == 0); assert(uri2[0].port == 8989); - assert(strlen(uri2[1].subdir) == 0); + assert(strlen(uri2[0].subdir) == 0); assert(strcmp(uri2[0].dst.ipv4, "127.0.0.1") == 0); assert(uri2[1].dtype == LTTNG_DST_IPV4); assert(uri2[1].utype == LTTNG_URI_DST);