From 16ba43eb3e96c1e430734f866a4316e7e8a229ae Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 5 Sep 2016 18:36:17 +0200
Subject: [PATCH 1/1] try to get tesh ignoring the cruft of Jenkins and friends

---
 doc/manpage/tesh.pod    |  3 ++-
 tools/cmake/Tests.cmake |  1 +
 tools/tesh/tesh.py      | 13 ++++++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/doc/manpage/tesh.pod b/doc/manpage/tesh.pod
index b773ba8923..e7a8a8374f 100755
--- a/doc/manpage/tesh.pod
+++ b/doc/manpage/tesh.pod
@@ -22,7 +22,8 @@ they produce the expected output and return the expected value.
   --setenv var=value  : set a specific environment variable
   --cfg arg           : add parameter --cfg=arg to each command line
   --log arg           : add parameter --log=arg to each command line
-  --enable-coverage   : ignore output lines starting with "profiling:"
+  --ignore-jenkins    : ignore all cruft generated on SimGrid
+                        continous integration servers
 
 
 =head1 TEST SUITE FILE SYTAX
diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index a85ee3deb8..f533ea4754 100644
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -6,6 +6,7 @@ IF(enable_smpi AND NOT WIN32)
   execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun)
 ENDIF()
 
+SET(TESH_OPTION "--ignore-jenkins")
 SET(TESH_COMMAND ${CMAKE_BINARY_DIR}/bin/tesh)
 IF(CMAKE_HOST_WIN32)
   SET(TESH_OPTION ${TESH_OPTION} --timeout 50)
diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py
index 7f3aca4df6..f5d32b8cb3 100755
--- a/tools/tesh/tesh.py
+++ b/tools/tesh/tesh.py
@@ -382,7 +382,7 @@ if __name__ == '__main__':
     group1.add_argument('--setenv', metavar='var=value', action='append', help='set a specific environment variable')
     group1.add_argument('--cfg', metavar='arg', help='add parameter --cfg=arg to each command line')
     group1.add_argument('--log', metavar='arg', help='add parameter --log=arg to each command line')
-    group1.add_argument('--enable-coverage', action='store_true', help='ignore output lines starting with "profiling:"')
+    group1.add_argument('--ignore-jenkins', action='store_true', help='ignore all cruft generated on SimGrid continous integration servers')
     group1.add_argument('--wrapper', metavar='arg', help='Run each command in the provided wrapper (eg valgrind)')
 
     try:
@@ -392,10 +392,13 @@ if __name__ == '__main__':
 
     if options.cd is not None:
         os.chdir(options.cd)
-
-    if options.enable_coverage:
-        print("Enable coverage")
-        TeshState().ignore_regexps_common = [re.compile("^profiling:")]
+    
+    if options.ignore_jenkins:
+        print("Ignore all cruft seen on SimGrid's continous integration servers")
+        TeshState().ignore_regexps_common = [
+           re.compile("^profiling:"),
+           re.compile("WARNING: ASan doesn't fully support"),
+           re.compile("Unable to clean temporary file C:")]
     
     if options.teshfile is None:
         f = FileReader(None)
-- 
2.20.1