X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_uri.c;h=723bc2c1f2ebcc46716d8cabb63d49d9de0366b3;hp=cd95753960006eb301ce440c88a0a042d557d607;hb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;hpb=5d7ba9b6a9d159d55ca100761f05cc8a1edf7318

diff --git a/tests/unit/test_uri.c b/tests/unit/test_uri.c
index cd9575396..723bc2c1f 100644
--- a/tests/unit/test_uri.c
+++ b/tests/unit/test_uri.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
  *
- * 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 <assert.h>
@@ -30,7 +20,7 @@ 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;
@@ -75,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");
 
@@ -93,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 &&
@@ -117,14 +107,14 @@ 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,
+	   strcmp(uri[1].dst.ipv6, "::1") == 0,
 	   "URI set to net6://[::1]:8989");
 
 	if (uri) {
@@ -198,7 +188,7 @@ void test_uri_parsing(void)
 	assert(!uri);
 }
 
-void test_uri_cmp()
+static void test_uri_cmp()
 {
 	struct lttng_uri *uri1, *uri2;
 	const char *s_uri1 = "net://localhost";
@@ -230,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);