From f3fcdb0a92dbfed3956fed57bb7bc2715f06944c Mon Sep 17 00:00:00 2001
From: miod <>
Date: Sat, 20 Oct 2007 12:37:09 +0000
Subject: Give more details on failure.

---
 src/regress/lib/libc/dirname/dirname_test.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/regress/lib/libc/dirname/dirname_test.c b/src/regress/lib/libc/dirname/dirname_test.c
index 0dd95d6c30..add76980cf 100644
--- a/src/regress/lib/libc/dirname/dirname_test.c
+++ b/src/regress/lib/libc/dirname/dirname_test.c
@@ -30,7 +30,7 @@ main(void)
 	strlcat(path, fname, sizeof(path));
 	str = dirname(path);
 	if (strcmp(str, dname) != 0)
-		goto fail;
+		errx(1, "0: dirname(%s) = %s != %s", path, str, dname);
 
 	/*
 	 * There are four states that require special handling:
@@ -52,20 +52,20 @@ main(void)
 	/* Case 1 */
 	str = dirname(NULL);
 	if (strcmp(str, ".") != 0)
-		goto fail;
+		errx(1, "1: dirname(NULL) = %s != .", str);
 
 	/* Case 2 */
 	strlcpy(path, "", sizeof(path));
 	str = dirname(path);
 	if (strcmp(str, ".") != 0)
-		goto fail;
+		errx(1, "2: dirname(%s) = %s != .", path, str);
 
 	/* Case 3 */
 	for (i = 0; i < MAXPATHLEN - 1; i++)
 		strlcat(path, "/", sizeof(path));	/* path cleared above */
 	str = dirname(path);
 	if (strcmp(str, "/") != 0)
-		goto fail;
+		errx(1, "3: dirname(%s) = %s != /", path, str);
 
 	/* Case 4 */
 	strlcpy(path, "/", sizeof(path));		/* reset path */
@@ -73,10 +73,10 @@ main(void)
 		strlcat(path, dir, sizeof(path));
 	strlcat(path, fname, sizeof(path));
 	str = dirname(path);
-	if (str != NULL || errno != ENAMETOOLONG)
-		goto fail;
+	if (str != NULL)
+		errx(1, "4: dirname(%s) = %s != NULL", path, str);
+	if (errno != ENAMETOOLONG)
+		errx(1, "4: dirname(%s) sets errno to %d", path, errno);
 
 	return (0);
-fail:
-	return (1);
 }
-- 
cgit v1.2.3-55-g6feb