else:
raise "This program is expected to run with Python3 only"
-
-
##############
#
# Utilities
#py2
FileNotFoundError = OSError
+##############
+#
+# Cleanup on signal
+#
+#
+
+# Global variable. Stores which process group should be killed (or None otherwise)
+pgtokill = None
+
+def kill_process_group(pgid):
+ # print("Kill process group {}".format(pgid))
+ 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 is not None:
+ kill_process_group(pgtokill)
+ tesh_exit(5)
+
+
##############
#
args = shlex.split(self.args)
#print (args)
+ global pgtokill
+
try:
- proc = subprocess.Popen(args, bufsize=1, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True)
+ proc = subprocess.Popen(args, bufsize=1, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, start_new_session=True)
+ try:
+ 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)
except OSError as osE:
if osE.errno == 8:
- osE.strerror += "\nOSError: [Errno 8] Executed scripts should start with shebang line (like #!/bin/sh)"
+ osE.strerror += "\nOSError: [Errno 8] Executed scripts should start with shebang line (like #!/usr/bin/env sh)"
raise osE
cmdName = FileReader().filename+":"+str(self.linenumber)
try:
(stdout_data, stderr_data) = proc.communicate("\n".join(self.input_pipe), self.timeout)
+ pgtokill = None
except subprocess.TimeoutExpired:
print("Test suite `"+FileReader().filename+"': NOK (<"+cmdName+"> timeout after "+str(self.timeout)+" sec)")
- proc.kill()
+ kill_process_group(pgtokill)
tesh_exit(3)
if self.output_display:
if __name__ == '__main__':
+ signal.signal(signal.SIGINT, signal_handler)
+ signal.signal(signal.SIGTERM, signal_handler)
parser = argparse.ArgumentParser(description='tesh -- testing shell', add_help=True)
group1 = parser.add_argument_group('Options')
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
