From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 19 Nov 2014 20:48:00 +0000 (+0100)
Subject: test: Unset GCC_COLORS to avoid confusing argument processing tests
X-Git-Tag: v3.2.1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c4102163228295b0263eec7f41518fd750d6f3c;p=thirdparty%2Fccache.git

test: Unset GCC_COLORS to avoid confusing argument processing tests
---

diff --git a/test.sh b/test.sh
index 79e3e0d1e..b511146c7 100755
--- 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 bbb048009..3590d032c 100644
--- 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++) {