From 2e3689e1101cb878103ce2cab41e398d61dec6b6 Mon Sep 17 00:00:00 2001
From: Kito Cheng <kito.cheng@gmail.com>
Date: Sat, 20 Feb 2016 12:19:38 +0800
Subject: [PATCH] Prevent different test result between make check and execute
 ./testargs directly

 - Execute ./testargs directly will fail since icecc will append -fdiagnostics-color
   due to gcc detect the stdout istty and can output with color.

 - So set ICECC_COLOR_DIAGNOSTICS=0 in test program to prevent got different test
   result.

 - Example fail message:
1 failed
     got: "local:0 language:C++ compiler:gcc local:'-D, TEST=1' remote:'-c' rest:'-fdiagnostics-color'"
expected: "local:0 language:C++ compiler:gcc local:'-D, TEST=1' remote:'-c' rest:''"
---
 tests/args.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/args.cpp b/tests/args.cpp
index 9f9685b0a..e34680f7c 100644
--- a/tests/args.cpp
+++ b/tests/args.cpp
@@ -5,6 +5,19 @@
 
 using namespace std;
 
+static const char *ICECC_COLOR_DIAGNOSTICS = NULL;
+void backup_icecc_color_diagnostics() {
+  ICECC_COLOR_DIAGNOSTICS = getenv("ICECC_COLOR_DIAGNOSTICS");
+  setenv("ICECC_COLOR_DIAGNOSTICS", "0", 1);
+}
+
+void restore_icecc_color_diagnostics() {
+  if (ICECC_COLOR_DIAGNOSTICS)
+    setenv("ICECC_COLOR_DIAGNOSTICS", ICECC_COLOR_DIAGNOSTICS, 1);
+  else
+    unsetenv("ICECC_COLOR_DIAGNOSTICS");
+}
+
 void test_run(const string &prefix, const char * const *argv, bool icerun, const string expected) {
   list<string> extrafiles;
   CompileJob job;
@@ -25,17 +38,23 @@ void test_run(const string &prefix, const char * const *argv, bool icerun, const
 
 static void test_1() {
    const char * argv[] = { "gcc", "-D", "TEST=1", "-c", "main.cpp", "-o", "main.o", 0 };
+   backup_icecc_color_diagnostics();
    test_run("1", argv, false, "local:0 language:C++ compiler:gcc local:'-D, TEST=1' remote:'-c' rest:''");
+   restore_icecc_color_diagnostics();
 }
 
 static void test_2() {
    const char * argv[] = { "gcc", "-DTEST=1", "-c", "main.cpp", "-o", "main.o", 0 };
+   backup_icecc_color_diagnostics();
    test_run("2", argv, false, "local:0 language:C++ compiler:gcc local:'-DTEST=1' remote:'-c' rest:''");
+   restore_icecc_color_diagnostics();
 }
 
 static void test_3() {
    const char * argv[] = { "clang", "-D", "TEST1=1", "-I.", "-c", "make1.cpp", "-o", "make.o", 0};
+   backup_icecc_color_diagnostics();
    test_run("3", argv, false, "local:0 language:C++ compiler:clang local:'-D, TEST1=1, -I.' remote:'-c' rest:''");
+   restore_icecc_color_diagnostics();
 }
 
 int main() {