From 8697dd3da402ea7a45774baef2bb26ebcd5b386e Mon Sep 17 00:00:00 2001
From: Thibault Saunier <thibault.saunier@collabora.com>
Date: Fri, 10 Jan 2014 10:27:25 +0100
Subject: [PATCH] validate:tools: Add an option to desativate ANSI colors

And enhance some debugging output
---
 validate/tools/launcher/baseclasses.py | 3 ++-
 validate/tools/launcher/main.py        | 7 +++++++
 validate/tools/launcher/utils.py       | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/validate/tools/launcher/baseclasses.py b/validate/tools/launcher/baseclasses.py
index 5281d11cf2..e72562e464 100644
--- a/validate/tools/launcher/baseclasses.py
+++ b/validate/tools/launcher/baseclasses.py
@@ -313,7 +313,8 @@ class _TestsLauncher(Loggable):
             if tester.init() is True:
                 self.testers.append(tester)
             else:
-                self.warning("Can not init tester: %s", tester.name)
+                self.warning("Can not init tester: %s -- PATH is %s"
+                             % (tester.name, os.environ["PATH"]))
 
     def add_options(self, parser):
         for tester in self.testers:
diff --git a/validate/tools/launcher/main.py b/validate/tools/launcher/main.py
index 112fa7d57a..ccc9384b7b 100644
--- a/validate/tools/launcher/main.py
+++ b/validate/tools/launcher/main.py
@@ -17,6 +17,7 @@
 # Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 import os
+import utils
 import urlparse
 import loggable
 from optparse import OptionParser
@@ -67,6 +68,9 @@ def main():
                      default=None,
                      help="Set the path to which projects should be"
                      " renderd")
+    parser.add_option("-n", "--no-color", dest="no_color",
+                     action="store_true", default=False,
+                     help="Set it to output no colored text in the terminal")
     loggable.init("GST_VALIDATE_LAUNCHER_DEBUG", True, False)
 
     tests_launcher = _TestsLauncher()
@@ -78,6 +82,9 @@ def main():
         options.dest = os.path.join(options.logsdir, "rendered")
     if urlparse.urlparse(options.dest).scheme == "":
         options.dest = path2url(options.dest)
+    if options.no_color:
+        utils.desactivate_colors()
+
     tests_launcher.set_settings(options, args)
 
     if options.list_tests:
diff --git a/validate/tools/launcher/utils.py b/validate/tools/launcher/utils.py
index ba80995b95..43bba25ea6 100644
--- a/validate/tools/launcher/utils.py
+++ b/validate/tools/launcher/utils.py
@@ -48,7 +48,7 @@ class Colors(object):
     ENDC = '\033[0m'
 
 
-def desactivate_colors(self):
+def desactivate_colors():
     Colors.HEADER = ''
     Colors.OKBLUE = ''
     Colors.OKGREEN = ''