tests: Simplify unit tests with a global variable

It's a little awkward to thread the test result through manually; much
easier to just make bfs_check() update a global variable.

1 files changed, 47 insertions, 54 deletions

diff --git a/tests/bfstd.c b/tests/bfstd.c
index f0f61ce..e59ac34 100644
--- a/tests/bfstd.c
+++ b/tests/bfstd.c
@@ -11,83 +11,76 @@
 #include <string.h>
 
 /** Check the result of xdirname()/xbasename(). */
-static bool check_base_dir(const char *path, const char *dir, const char *base) {
-	bool ret = true;
-
+static void check_base_dir(const char *path, const char *dir, const char *base) {
 	char *xdir = xdirname(path);
 	bfs_everify(xdir, "xdirname()");
-	ret &= bfs_check(strcmp(xdir, dir) == 0, "xdirname('%s') == '%s' (!= '%s')", path, xdir, dir);
+	bfs_check(strcmp(xdir, dir) == 0, "xdirname('%s') == '%s' (!= '%s')", path, xdir, dir);
 	free(xdir);
 
 	char *xbase = xbasename(path);
 	bfs_everify(xbase, "xbasename()");
-	ret &= bfs_check(strcmp(xbase, base) == 0, "xbasename('%s') == '%s' (!= '%s')", path, xbase, base);
+	bfs_check(strcmp(xbase, base) == 0, "xbasename('%s') == '%s' (!= '%s')", path, xbase, base);
 	free(xbase);
-
-	return ret;
 }
 
 /** Check the result of wordesc(). */
-static bool check_wordesc(const char *str, const char *exp, enum wesc_flags flags) {
+static void check_wordesc(const char *str, const char *exp, enum wesc_flags flags) {
 	char buf[256];
 	char *end = buf + sizeof(buf);
 	char *esc = wordesc(buf, end, str, flags);
 
-	return bfs_check(esc != end)
-		&& bfs_check(strcmp(buf, exp) == 0, "wordesc('%s') == '%s' (!= '%s')", str, buf, exp);
+	if (bfs_check(esc != end)) {
+		bfs_check(strcmp(buf, exp) == 0, "wordesc('%s') == '%s' (!= '%s')", str, buf, exp);
+	}
 }
 
-bool check_bfstd(void) {
-	bool ret = true;
-
-	ret &= bfs_check(asciilen("") == 0);
-	ret &= bfs_check(asciilen("@") == 1);
-	ret &= bfs_check(asciilen("@@") == 2);
-	ret &= bfs_check(asciilen("\xFF@") == 0);
-	ret &= bfs_check(asciilen("@\xFF") == 1);
-	ret &= bfs_check(asciilen("@@@@@@@@") == 8);
-	ret &= bfs_check(asciilen("@@@@@@@@@@@@@@@@") == 16);
-	ret &= bfs_check(asciilen("@@@@@@@@@@@@@@@@@@@@@@@@") == 24);
-	ret &= bfs_check(asciilen("@@@@@@@@@@@@@@a\xFF@@@@@@@") == 15);
-	ret &= bfs_check(asciilen("@@@@@@@@@@@@@@@@\xFF@@@@@@@") == 16);
-	ret &= bfs_check(asciilen("@@@@@@@@@@@@@@@@a\xFF@@@@@@") == 17);
-	ret &= bfs_check(asciilen("@@@@@@@\xFF@@@@@@a\xFF@@@@@@@") == 7);
-	ret &= bfs_check(asciilen("@@@@@@@@\xFF@@@@@a\xFF@@@@@@@") == 8);
-	ret &= bfs_check(asciilen("@@@@@@@@@\xFF@@@@a\xFF@@@@@@@") == 9);
+void check_bfstd(void) {
+	bfs_check(asciilen("") == 0);
+	bfs_check(asciilen("@") == 1);
+	bfs_check(asciilen("@@") == 2);
+	bfs_check(asciilen("\xFF@") == 0);
+	bfs_check(asciilen("@\xFF") == 1);
+	bfs_check(asciilen("@@@@@@@@") == 8);
+	bfs_check(asciilen("@@@@@@@@@@@@@@@@") == 16);
+	bfs_check(asciilen("@@@@@@@@@@@@@@@@@@@@@@@@") == 24);
+	bfs_check(asciilen("@@@@@@@@@@@@@@a\xFF@@@@@@@") == 15);
+	bfs_check(asciilen("@@@@@@@@@@@@@@@@\xFF@@@@@@@") == 16);
+	bfs_check(asciilen("@@@@@@@@@@@@@@@@a\xFF@@@@@@") == 17);
+	bfs_check(asciilen("@@@@@@@\xFF@@@@@@a\xFF@@@@@@@") == 7);
+	bfs_check(asciilen("@@@@@@@@\xFF@@@@@a\xFF@@@@@@@") == 8);
+	bfs_check(asciilen("@@@@@@@@@\xFF@@@@a\xFF@@@@@@@") == 9);
 
 	// From man 3p basename
-	ret &= check_base_dir("usr", ".", "usr");
-	ret &= check_base_dir("usr/", ".", "usr");
-	ret &= check_base_dir("", ".", ".");
-	ret &= check_base_dir("/", "/", "/");
+	check_base_dir("usr", ".", "usr");
+	check_base_dir("usr/", ".", "usr");
+	check_base_dir("", ".", ".");
+	check_base_dir("/", "/", "/");
 	// check_base_dir("//", "/" or "//", "/" or "//");
-	ret &= check_base_dir("///", "/", "/");
-	ret &= check_base_dir("/usr/", "/", "usr");
-	ret &= check_base_dir("/usr/lib", "/usr", "lib");
-	ret &= check_base_dir("//usr//lib//", "//usr", "lib");
-	ret &= check_base_dir("/home//dwc//test", "/home//dwc", "test");
+	check_base_dir("///", "/", "/");
+	check_base_dir("/usr/", "/", "usr");
+	check_base_dir("/usr/lib", "/usr", "lib");
+	check_base_dir("//usr//lib//", "//usr", "lib");
+	check_base_dir("/home//dwc//test", "/home//dwc", "test");
 
-	ret &= check_wordesc("", "\"\"", WESC_SHELL);
-	ret &= check_wordesc("word", "word", WESC_SHELL);
-	ret &= check_wordesc("two words", "\"two words\"", WESC_SHELL);
-	ret &= check_wordesc("word's", "\"word's\"", WESC_SHELL);
-	ret &= check_wordesc("\"word\"", "'\"word\"'", WESC_SHELL);
-	ret &= check_wordesc("\"word's\"", "'\"word'\\''s\"'", WESC_SHELL);
-	ret &= check_wordesc("\033[1mbold's\033[0m", "$'\\e[1mbold\\'s\\e[0m'", WESC_SHELL | WESC_TTY);
-	ret &= check_wordesc("\x7F", "$'\\x7F'", WESC_SHELL | WESC_TTY);
-	ret &= check_wordesc("~user", "\"~user\"", WESC_SHELL);
+	check_wordesc("", "\"\"", WESC_SHELL);
+	check_wordesc("word", "word", WESC_SHELL);
+	check_wordesc("two words", "\"two words\"", WESC_SHELL);
+	check_wordesc("word's", "\"word's\"", WESC_SHELL);
+	check_wordesc("\"word\"", "'\"word\"'", WESC_SHELL);
+	check_wordesc("\"word's\"", "'\"word'\\''s\"'", WESC_SHELL);
+	check_wordesc("\033[1mbold's\033[0m", "$'\\e[1mbold\\'s\\e[0m'", WESC_SHELL | WESC_TTY);
+	check_wordesc("\x7F", "$'\\x7F'", WESC_SHELL | WESC_TTY);
+	check_wordesc("~user", "\"~user\"", WESC_SHELL);
 
 	const char *charmap = nl_langinfo(CODESET);
 	if (strcmp(charmap, "UTF-8") == 0) {
-		ret &= check_wordesc("\xF0", "$'\\xF0'", WESC_SHELL | WESC_TTY);
-		ret &= check_wordesc("\xF0\x9F", "$'\\xF0\\x9F'", WESC_SHELL | WESC_TTY);
-		ret &= check_wordesc("\xF0\x9F\x98", "$'\\xF0\\x9F\\x98'", WESC_SHELL | WESC_TTY);
-		ret &= check_wordesc("\xF0\x9F\x98\x80", "\xF0\x9F\x98\x80", WESC_SHELL | WESC_TTY);
-		ret &= check_wordesc("\xCB\x9Cuser", "\xCB\x9Cuser", WESC_SHELL);
+		check_wordesc("\xF0", "$'\\xF0'", WESC_SHELL | WESC_TTY);
+		check_wordesc("\xF0\x9F", "$'\\xF0\\x9F'", WESC_SHELL | WESC_TTY);
+		check_wordesc("\xF0\x9F\x98", "$'\\xF0\\x9F\\x98'", WESC_SHELL | WESC_TTY);
+		check_wordesc("\xF0\x9F\x98\x80", "\xF0\x9F\x98\x80", WESC_SHELL | WESC_TTY);
+		check_wordesc("\xCB\x9Cuser", "\xCB\x9Cuser", WESC_SHELL);
 	}
 
-	ret &= bfs_check(xstrwidth("Hello world") == 11);
-	ret &= bfs_check(xstrwidth("Hello\1world") == 10);
-
-	return ret;
+	bfs_check(xstrwidth("Hello world") == 11);
+	bfs_check(xstrwidth("Hello\1world") == 10);
 }