X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e044aacdc2c13e6d78c4f5bb64db0f25140bc10..41ace32b5ffcd51fe79324b5353e5f1a6029d41e:/tools/tesh/tesh.py diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py index 37f8289c9c..16116ee001 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-2019. 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 @@ -79,7 +81,7 @@ def fatal_error(msg): # arg must be a string with the format "variable=value" def setenv(arg): print("[Tesh/INFO] setenv "+arg) - t = arg.split("=") + t = arg.split("=", 1) os.environ[t[0]] = t[1] #os.putenv(t[0], t[1]) does not work #see http://stackoverflow.com/questions/17705419/python-os-environ-os-putenv-usr-bin-env @@ -106,6 +108,9 @@ except NameError: 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)) try: os.killpg(pgid, signal.SIGTERM) @@ -183,7 +188,7 @@ class TeshState(Singleton): t.acquire() t.release() -#Command line object +# Command line object class Cmd(object): def __init__(self): self.input_pipe = [] @@ -194,7 +199,8 @@ class Cmd(object): self.linenumber = -1 self.background = False - self.cwd = None + # Python threads loose the cwd + self.cwd = os.getcwd() self.ignore_output = False self.expect_return = 0 @@ -254,8 +260,6 @@ class Cmd(object): def run_if_possible(self): if self.can_run(): if self.background: - #Python threads loose the cwd - self.cwd = os.getcwd() lock = _thread.allocate_lock() lock.acquire() TeshState().add_thread(lock) @@ -268,10 +272,8 @@ class Cmd(object): def _run(self, lock=None): - #Python threads loose the cwd - if self.cwd is not None: - os.chdir(self.cwd) - self.cwd = None + # Python threads loose the cwd + os.chdir(self.cwd) #retrocompatibility: support ${aaa:=.} variable format def replace_perl_variables(m): @@ -314,12 +316,21 @@ 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) + 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) + if not isWindows(): + pgtokill = os.getpgid(proc.pid) except OSError: # os.getpgid failed. OK. No cleanup. pass + except PermissionError: + print("["+FileReader().filename+":"+str(self.linenumber)+"] Cannot start '"+args[0]+"': The binary is not executable.") + print("["+FileReader().filename+":"+str(self.linenumber)+"] Current dir: "+os.getcwd()) + tesh_exit(3) + except NotADirectoryError: + print("["+FileReader().filename+":"+str(self.linenumber)+"] Cannot start '"+args[0]+"': The path to binary does not exist.") + print("["+FileReader().filename+":"+str(self.linenumber)+"] Current dir: "+os.getcwd()) + tesh_exit(3) except FileNotFoundError: print("["+FileReader().filename+":"+str(self.linenumber)+"] Cannot start '"+args[0]+"': File not found") tesh_exit(3) @@ -453,18 +464,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