INN commit: branches/2.4/tests (runtests.c)

INN Commit Russ_Allbery at isc.org
Mon Sep 11 23:03:12 UTC 2006


    Date: Monday, September 11, 2006 @ 16:03:12
  Author: eagle
Revision: 7578

Work around a bad interaction between the glibc headers and gcc 4.1 that
causes the sys/wait.h W* macros to fail to compile when run on an int 
member of a const struct.

Modified:
  branches/2.4/tests/runtests.c

------------+
 runtests.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: runtests.c
===================================================================
--- runtests.c	2006-09-11 23:03:01 UTC (rev 7577)
+++ runtests.c	2006-09-11 23:03:12 UTC (rev 7578)
@@ -126,13 +126,13 @@
 static void sysdie(const char *format, ...);
 static void *x_malloc(size_t, const char *file, int line);
 static char *x_strdup(const char *, const char *file, int line);
-static int test_analyze(const struct testset *);
+static int test_analyze(struct testset *);
 static int test_batch(const char *testlist);
 static void test_checkline(const char *line, struct testset *);
 static void test_fail_summary(const struct testlist *);
 static int test_init(const char *line, struct testset *);
 static int test_print_range(int first, int last, int chars, int limit);
-static void test_summarize(const struct testset *, int status);
+static void test_summarize(struct testset *, int status);
 static pid_t test_start(const char *path, int *fd);
 static double tv_diff(const struct timeval *, const struct timeval *);
 static double tv_seconds(const struct timeval *);
@@ -369,7 +369,7 @@
    with a non-zero status, and a negative integer representing the signal
    that terminated it if it was killed by a signal. */
 static void
-test_summarize(const struct testset *ts, int status)
+test_summarize(struct testset *ts, int status)
 {
     int i;
     int missing = 0;
@@ -436,7 +436,7 @@
    few special error messages, and then pass it along to test_summarize()
    for the regular output. */
 static int
-test_analyze(const struct testset *ts)
+test_analyze(struct testset *ts)
 {
     if (ts->reported) return 0;
     if (WIFEXITED(ts->status) && WEXITSTATUS(ts->status) != 0) {
@@ -522,7 +522,7 @@
 static void
 test_fail_summary(const struct testlist *fails)
 {
-    const struct testset *ts;
+    struct testset *ts;
     int i, chars, total, first, last;
 
     puts(header);



More information about the inn-committers mailing list