Report each failed test once, but keep a count and report that count

if there was more than one.  In particular, this simplifies
test_tar_filenames.c, which has a tendency to be very noisy otherwise.

Approved by: re (blanket, libarchive testing)

lib/libarchive/test/main.c

@@ -60,12 +60,59 @@ static int skips = 0;
  */
 static char msg[4096];
 
+/*
+ * For each test source file, we remember how many times each
+ * failure was reported.
+ */
+static const char *failed_filename;
+static struct line {
+	int line;
+	int count;
+}  failed_lines[1000];
+
+
+/* Count this failure; return the number of previous failures. */
+static int
+previous_failures(const char *filename, int line)
+{
+	int i;
+	int count;
+
+	if (failed_filename == NULL || strcmp(failed_filename, filename) != 0)
+		memset(failed_lines, 0, sizeof(failed_lines));
+	failed_filename = filename;
+
+	for (i = 0; i < sizeof(failed_lines)/sizeof(failed_lines[0]); i++) {
+		if (failed_lines[i].line == line) {
+			count = failed_lines[i].count;
+			failed_lines[i].count++;
+			return (count);
+		}
+		if (failed_lines[i].line == 0) {
+			failed_lines[i].line = line;
+			failed_lines[i].count = 1;
+			return (0);
+		}
+	}
+}
 
 /* Inform user that we're skipping a test. */
-void
+static const char *skipped_filename;
-skipping(const char *fmt, ...)
+static int skipped_line;
+void skipping_setup(const char *filename, int line)
 {
+	skipped_line = line;
+}
+void
+test_skipping(const char *fmt, ...)
+{
+	int i;
+	int line = skipped_line;
 	va_list ap;
+
+	if (previous_failures(skipped_filename, skipped_line))
+		return;
+
 	va_start(ap, fmt);
 	fprintf(stderr, " *** SKIPPING: ");
 	vfprintf(stderr, fmt, ap);
@@ -76,8 +123,10 @@ skipping(const char *fmt, ...)
 
 /* Common handling of failed tests. */
 static void
-test_failed(struct archive *a)
+test_failed(struct archive *a, int line)
 {
+	int i;
+
 	failures ++;
 
 	if (msg[0] != '\0') {
@@ -95,6 +144,39 @@ test_failed(struct archive *a)
 	}
 }
 
+/* Summarize repeated failures in the just-completed test file. */
+int
+summarize_comparator(const void *a0, const void *b0)
+{
+	const struct line *a = a0, *b = b0;
+	if (a->line == 0 && b->line == 0)
+		return (0);
+	if (a->line == 0)
+		return (1);
+	if (b->line == 0)
+		return (-1);
+	return (a->line - b->line);
+}
+
+void
+summarize(const char *filename)
+{
+	int i;
+
+	qsort(failed_lines, sizeof(failed_lines)/sizeof(failed_lines[0]),
+	    sizeof(failed_lines[0]), summarize_comparator);
+	for (i = 0; i < sizeof(failed_lines)/sizeof(failed_lines[0]); i++) {
+		if (failed_lines[i].line == 0)
+			break;
+		if (failed_lines[i].count > 1)
+			fprintf(stderr, "%s:%d: Failed %d times\n",
+			    failed_filename, failed_lines[i].line,
+			    failed_lines[i].count);
+	}
+	/* Clear the failure history for the next file. */
+	memset(failed_lines, 0, sizeof(failed_lines));
+}
+
 /* Set up a message to display only after a test fails. */
 void
 failure(const char *fmt, ...)
@@ -113,9 +195,11 @@ test_assert(const char *file, int line, int value, const char *condition, struct
 		msg[0] = '\0';
 		return;
 	}
+	if (previous_failures(file, line))
+		return;
 	fprintf(stderr, "%s:%d: Assertion failed\n", file, line);
 	fprintf(stderr, "   Condition: %s\n", condition);
-	test_failed(a);
+	test_failed(a, line);
 }
 
 /* assertEqualInt() displays the values of the two integers. */
@@ -127,11 +211,13 @@ test_assert_equal_int(const char *file, int line,
 		msg[0] = '\0';
 		return;
 	}
+	if (previous_failures(file, line))
+		return;
 	fprintf(stderr, "%s:%d: Assertion failed: Ints not equal\n",
 	    file, line);
 	fprintf(stderr, "      %s=%d\n", e1, v1);
 	fprintf(stderr, "      %s=%d\n", e2, v2);
-	test_failed(a);
+	test_failed(a, line);
 }
 
 /* assertEqualString() displays the values of the two strings. */
@@ -150,11 +236,13 @@ test_assert_equal_string(const char *file, int line,
 		msg[0] = '\0';
 		return;
 	}
+	if (previous_failures(file, line))
+		return;
 	fprintf(stderr, "%s:%d: Assertion failed: Strings not equal\n",
 	    file, line);
 	fprintf(stderr, "      %s = \"%s\"\n", e1, v1);
 	fprintf(stderr, "      %s = \"%s\"\n", e2, v2);
-	test_failed(a);
+	test_failed(a, line);
 }
 
 /* assertEqualWString() displays the values of the two strings. */
@@ -168,11 +256,13 @@ test_assert_equal_wstring(const char *file, int line,
 		msg[0] = '\0';
 		return;
 	}
+	if (previous_failures(file, line))
+		return;
 	fprintf(stderr, "%s:%d: Assertion failed: Unicode strings not equal\n",
 	    file, line);
 	fwprintf(stderr, L"      %s = \"%ls\"\n", e1, v1);
 	fwprintf(stderr, L"      %s = \"%ls\"\n", e2, v2);
-	test_failed(a);
+	test_failed(a, line);
 }
 
 /*
@@ -217,6 +307,7 @@ static int test_run(int i, const char *tmpdir)
 		exit(1);
 	}
 	(*tests[i].func)();
+	summarize(tests[i].name);
 	return (failures == failures_before ? 0 : 1);
 }
 

lib/libarchive/test/test.h

@@ -116,9 +116,19 @@
 #define assertEqualWString(v1,v2)   \
   test_assert_equal_wstring(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL)
 
+/*
+ * This would be simple with C99 variadic macros, but I don't want to
+ * require that.  Instead, I insert a function call before each
+ * skipping() call to pass the file and line information down.  Crude,
+ * but effective.
+ */
+#define skipping	\
+  skipping_setup(__FILE__, __LINE__);test_skipping
+
 /* Function declarations.  These are defined in test_utility.c. */
 void failure(const char *fmt, ...);
-void skipping(const char *fmt, ...);
+void skipping_setup(const char *, int);
+void test_skipping(const char *fmt, ...);
 void test_assert(const char *, int, int, const char *, struct archive *);
 void test_assert_equal_int(const char *, int, int, const char *, int, const char *, struct archive *);
 void test_assert_equal_string(const char *, int, const char *v1, const char *, const char *v2, const char *, struct archive *);

lib/libarchive/test/test_tar_filenames.c

@@ -42,9 +42,6 @@ test_filename(const char *prefix, int dlen, int flen)
 	size_t used;
 	size_t prefix_length = 0;
 	int i = 0;
-#if ARCHIVE_VERSION_STAMP < 1009000
-	static int bug_reported_1 = 0, bug_reported_2 = 0, bug_reported_3 = 0;
-#endif
 
 	if (prefix) {
 		strcpy(filename, prefix);
@@ -118,10 +115,7 @@ test_filename(const char *prefix, int dlen, int flen)
 	/* Read the file and check the filename. */
 	assertA(0 == archive_read_next_header(a, &ae));
 #if ARCHIVE_VERSION_STAMP < 1009000
-	if (!bug_reported_3) {
+	skipping("Leading '/' preserved on long filenames");
-		skipping("Leading '/' preserved on long filenames");
-		++bug_reported_3;
-	}
 #else
 	assertEqualString(filename, archive_entry_pathname(ae));
 #endif
@@ -137,10 +131,7 @@ test_filename(const char *prefix, int dlen, int flen)
 	 */
 	assertA(0 == archive_read_next_header(a, &ae));
 #if ARCHIVE_VERSION_STAMP < 1009000
-	if (!bug_reported_2) {
+	skipping("Trailing '/' preserved on dirnames");
-		skipping("Trailing '/' preserved on dirnames");
-		++bug_reported_2;
-	}
 #else
 	assertEqualString(dirname, archive_entry_pathname(ae));
 #endif
@@ -148,10 +139,7 @@ test_filename(const char *prefix, int dlen, int flen)
 
 	assertA(0 == archive_read_next_header(a, &ae));
 #if ARCHIVE_VERSION_STAMP < 1009000
-	if (!bug_reported_1) {
+	skipping("Trailing '/' added to dir names");
-		skipping("Trailing '/' added to dir names");
-		++bug_reported_1;
-	}
 #else
 	assertEqualString(dirname, archive_entry_pathname(ae));
 #endif