Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / tools / tesh / tesh.py

diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py
index 8401305..8c62946 100755 (executable)
--- a/tools/tesh/tesh.py
+++ b/tools/tesh/tesh.py
@@ -162,6 +162,7 @@ class TeshState(Singleton):
         self.threads = []
         self.args_suffix = ""
         self.ignore_regexps_common = []
+        self.wrapper = None
     
     def add_thread(self, thread):
         self.threads.append(thread)
@@ -221,6 +222,7 @@ class Cmd(object):
         if file is None:
             fatal_error("Unable to create file "+filename)
         file.write("\n".join(self.input_pipe))
+        file.write("\n")
         file.close()
 
     def _cmd_cd(self, argline):
@@ -283,10 +285,16 @@ class Cmd(object):
             if lock is not None: lock.release()
             return
         
-        self.args = TeshState().wrapper + self.args + TeshState().args_suffix
+        if TeshState().wrapper is not None:
+            self.timeout *= 20
+            self.args = TeshState().wrapper + self.args
+        elif re.match(".*smpirun.*", self.args) is not None:
+            self.args = "sh " + self.args 
+
+        self.args += TeshState().args_suffix
         
         print("["+FileReader().filename+":"+str(self.linenumber)+"] "+self.args)
-        
+                
         args = shlex.split(self.args)
         #print (args)
         try:
@@ -376,7 +384,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:
@@ -386,10 +394,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)