X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/697e297f282dd1c06b0848d7bcbefd087f8d8730..e0ebf7976fb4d94d6a5a75e4131a036bd3ace277:/tools/tesh/tesh.py

diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py
index 6a2df5523c..3bc74483a5 100755
--- a/tools/tesh/tesh.py
+++ b/tools/tesh/tesh.py
@@ -5,7 +5,7 @@
 tesh -- testing shell
 ========================
 
-Copyright (c) 2012-2017. The SimGrid Team. All rights reserved.
+Copyright (c) 2012-2018. The SimGrid Team. All rights reserved.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the license (GNU LGPL) which comes with this package.
@@ -45,6 +45,8 @@ else:
 #
 #
 
+def isWindows():
+    return sys.platform.startswith('win')
 
 # Singleton metaclass that works in Python 2 & 3
 # http://stackoverflow.com/questions/6760685/creating-a-singleton-in-python
@@ -102,16 +104,23 @@ except NameError:
 #
 #
 
-# Global variable. Stores which process group should be killed (or -1 if none)
-pgtokill = -1
+# Global variable. Stores which process group should be killed (or None otherwise)
+pgtokill = None
 
 def kill_process_group(pgid):
+    if pgid is None: # Nobody to kill. We don't know who to kill on windows, or we don't have anyone to kill on signal handler
+        return
+
     # print("Kill process group {}".format(pgid))
-    os.killpg(pgid, signal.SIGTERM)
+    try:
+        os.killpg(pgid, signal.SIGTERM)
+    except OSError:
+        # os.killpg failed. OK. Some subprocesses may still be running.
+        pass
 
 def signal_handler(signal, frame):
     print("Caught signal {}".format(SIGNALS_TO_NAMES_DICT[signal]))
-    if pgtokill != -1:
+    if pgtokill is not None:
         kill_process_group(pgtokill)
     tesh_exit(5)
 
@@ -310,8 +319,13 @@ class Cmd(object):
         global pgtokill
 
         try:
-            proc = subprocess.Popen(args, bufsize=1, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, preexec_fn=os.setsid)
-            pgtokill = os.getpgid(proc.pid)
+            proc = subprocess.Popen(args, bufsize=1, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, start_new_session=True)
+            try:
+                if not isWindows():
+                    pgtokill = os.getpgid(proc.pid)
+            except OSError:
+                # os.getpgid failed. OK. No cleanup.
+                pass
         except FileNotFoundError:
             print("["+FileReader().filename+":"+str(self.linenumber)+"] Cannot start '"+args[0]+"': File not found")
             tesh_exit(3)
@@ -323,7 +337,7 @@ class Cmd(object):
         cmdName = FileReader().filename+":"+str(self.linenumber)
         try:
             (stdout_data, stderr_data) = proc.communicate("\n".join(self.input_pipe), self.timeout)
-            pgtokill = -1
+            pgtokill = None
         except subprocess.TimeoutExpired:
             print("Test suite `"+FileReader().filename+"': NOK (<"+cmdName+"> timeout after "+str(self.timeout)+" sec)")
             kill_process_group(pgtokill)
@@ -445,18 +459,20 @@ if __name__ == '__main__':
         print("Ignore all cruft seen on SimGrid's continous integration servers")
         # Note: regexps should match at the beginning of lines
         TeshState().ignore_regexps_common = [
-           re.compile("profiling:"),
-           re.compile("Unable to clean temporary file C:"),
-           re.compile(".*Configuration change: Set \'contexts/"),
-           re.compile("Picked up JAVA_TOOL_OPTIONS: "),
-           re.compile("Picked up _JAVA_OPTIONS: "),
-           re.compile("==[0-9]+== ?WARNING: ASan doesn\'t fully support"),
-           re.compile("==[0-9]+== ?WARNING: ASan is ignoring requested __asan_handle_no_return: stack top:"),
-           re.compile("False positive error reports may follow"),
-           re.compile("For details see http://code.google.com/p/address-sanitizer/issues/detail\\?id=189"),
-           re.compile("For details see https://github.com/google/sanitizers/issues/189"),
-           re.compile("Python runtime initialized with LC_CTYPE=C .*"),
-           re.compile("cmake: /usr/local/lib/libcurl.so.4: no version information available (required by cmake)"), # Seen on CircleCI
+           re.compile(r"profiling:"),
+           re.compile(r"Unable to clean temporary file C:"),
+           re.compile(r".*Configuration change: Set 'contexts/"),
+           re.compile(r"Picked up JAVA_TOOL_OPTIONS: "),
+           re.compile(r"Picked up _JAVA_OPTIONS: "),
+           re.compile(r"==[0-9]+== ?WARNING: ASan doesn't fully support"),
+           re.compile(r"==[0-9]+== ?WARNING: ASan is ignoring requested __asan_handle_no_return: stack top:"),
+           re.compile(r"False positive error reports may follow"),
+           re.compile(r"For details see http://code.google.com/p/address-sanitizer/issues/detail\?id=189"),
+           re.compile(r"For details see https://github.com/google/sanitizers/issues/189"),
+           re.compile(r"Python runtime initialized with LC_CTYPE=C .*"),
+           re.compile(r"cmake: /usr/local/lib/libcurl\.so\.4: no version information available \(required by cmake\)"), # Seen on CircleCI
+           re.compile(r".*mmap broken on FreeBSD, but dlopen\+thread broken too. Switching to dlopen\+raw contexts\."),
+           re.compile(r".*dlopen\+thread broken on Apple and BSD\. Switching to raw contexts\."),
            ]
         TeshState().jenkins = True # This is a Jenkins build