test: Unset GCC_COLORS to avoid confusing argument processing tests

diff --git a/test.sh b/test.sh
index 79e3e0d1ee57031388234570f59cfb980a3395a5..b511146c797fd359580d78d6b1933582a9d0abf8 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -43,6 +43,7 @@ unset CCACHE_SLOPPINESS
 unset CCACHE_TEMPDIR
 unset CCACHE_UMASK
 unset CCACHE_UNIFY
+unset GCC_COLORS
 
 # Many tests backdate files, which updates their ctimes.  In those tests, we
 # must ignore ctimes.  Might as well do so everywhere.

diff --git a/test/framework.c b/test/framework.c
index bbb0480099f696ebf8489677ebd98b37a07339e3..3590d032c2476695e7d92ebb74c489a75a409fb8 100644 (file)
--- a/test/framework.c
+++ b/test/framework.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 Joel Rosdahl
+ * Copyright (C) 2010-2014 Joel Rosdahl
  *
  * 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 the Free
@@ -18,6 +18,7 @@
 
 #include "ccache.h"
 #include "test/framework.h"
+#include "util.h"
 
 #if defined(HAVE_TERMIOS_H)
 #define USE_COLOR
@@ -64,6 +65,7 @@ cct_run(suite_fn *suites, int verbose_output)
        suite_fn *suite;
        int tty = is_tty(1);
 
+       x_unsetenv("GCC_COLORS"); /* Avoid confusing argument processing tests. */
        verbose = verbose_output;
 
        for (suite = suites; *suite; suite++) {