tesh -- testing shell
========================
-Copyright (c) 2012-2017. The SimGrid Team. All rights reserved.
+Copyright (c) 2012-2023. 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.
-
#TODO: child of child of child that printfs. Does it work?
#TODO: a child dies after its parent. What happen?
"""
-
-import sys, os
+import sys
+import errno
+import os
import shlex
import re
import difflib
import signal
import argparse
+import time
if sys.version_info[0] == 3:
import subprocess
import _thread
else:
- raise "This program is expected to run with Python3 only"
-
-
+ raise RuntimeError("This program is expected to run with Python3 only")
##############
#
#
#
-
# Singleton metaclass that works in Python 2 & 3
# http://stackoverflow.com/questions/6760685/creating-a-singleton-in-python
+
class _Singleton(type):
""" A metaclass that creates a Singleton base class when called. """
_instances = {}
+
def __call__(cls, *args, **kwargs):
if cls not in cls._instances:
cls._instances[cls] = super(_Singleton, cls).__call__(*args, **kwargs)
return cls._instances[cls]
-class Singleton(_Singleton('SingletonMeta', (object,), {})): pass
-
-SIGNALS_TO_NAMES_DICT = dict((getattr(signal, n), n) \
- for n in dir(signal) if n.startswith('SIG') and '_' not in n )
+class Singleton(_Singleton('SingletonMeta', (object,), {})):
+ """ The Singleton base class """
+ # pass
+SIGNALS_TO_NAMES_DICT = dict((getattr(signal, n), n)
+ for n in dir(signal) if n.startswith('SIG') and '_' not in n)
-#exit correctly
def tesh_exit(errcode):
- #If you do not flush some prints are skipped
+ """ Exit correctly """
+ # If you do not flush some prints are skipped
sys.stdout.flush()
- #os._exit exit even when executed within a thread
+ # os._exit exit even when executed within a thread
+ # pylint: disable=protected-access
os._exit(errcode)
def fatal_error(msg):
- print("[Tesh/CRITICAL] "+str(msg))
+ """ Exit with error """
+ print("[Tesh/CRITICAL] " + str(msg))
tesh_exit(1)
-#Set an environment variable.
-# arg must be a string with the format "variable=value"
def setenv(arg):
- print("[Tesh/INFO] setenv "+arg)
- t = arg.split("=")
- 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
+ """
+ Set an environment variable.
+ arg must be a string with the format "variable=value"
+ """
+ print("[Tesh/INFO] setenv " + arg)
+ (var, val) = arg.split("=", 1)
+ os.environ[var] = val
+ # os.putenv(var, val) does not work
+ # see http://stackoverflow.com/questions/17705419/python-os-environ-os-putenv-usr-bin-env
-#http://stackoverflow.com/questions/30734967/how-to-expand-environment-variables-in-python-as-bash-does
def expandvars2(path):
+ """ http://stackoverflow.com/questions/30734967/how-to-expand-environment-variables-in-python-as-bash-does """
return re.sub(r'(?<!\\)\$[A-Za-z_][A-Za-z0-9_]*', '', os.path.expandvars(path))
-# https://github.com/Cadair/jupyter_environment_kernels/issues/10
-try:
- FileNotFoundError
-except NameError:
- #py2
- FileNotFoundError = OSError
+##############
+#
+# Cleanup on signal
+#
+#
+
+def process_is_dead(pid):
+ """ Tests whether the process is dead already """
+ try:
+ os.kill(pid, 0)
+ except ProcessLookupError:
+ return True
+ except OSError as err:
+ if err.errno == errno.ESRCH: # ESRCH == No such process. The process is now dead
+ return True
+ return False
+
+def kill_process_group(pid):
+ """ This function send TERM signal + KILL signal after 0.2s to the group of the specified process """
+ if pid is None:
+ # Nobody to kill. We don't have anyone to kill on signal handler
+ return
+
+ try:
+ pgid = os.getpgid(pid)
+ except OSError:
+ # os.getpgid failed. Ok, don't cleanup.
+ return
+
+ try:
+ os.killpg(pgid, signal.SIGTERM)
+ if process_is_dead(pid):
+ return
+ time.sleep(0.2)
+ os.killpg(pgid, signal.SIGKILL)
+ except OSError:
+ # os.killpg failed. OK. Some subprocesses may still be running.
+ pass
+
+def signal_handler(signo, _frame):
+ """ Signal handler """
+ print("Caught signal {}".format(SIGNALS_TO_NAMES_DICT[signo]))
+ running_pids = TeshState().running_pids # Just in case of interthread conflicts.
+ for pid in running_pids:
+ kill_process_group(pid)
+ TeshState().running_pids.clear()
+ tesh_exit(5)
##############
#
-
-# read file line per line (and concat line that ends with "\")
class FileReader(Singleton):
+ """ Read file line per line (and concat line that ends with "\") """
def __init__(self, filename=None):
if filename is None:
self.filename = "(stdin)"
- self.f = sys.stdin
+ self.fileno = sys.stdin
else:
self.filename_raw = filename
self.filename = os.path.basename(filename)
self.abspath = os.path.abspath(filename)
- self.f = open(self.filename_raw)
+ self.fileno = open(self.filename_raw)
self.linenumber = 0
def __repr__(self):
- return self.filename+":"+str(self.linenumber)
+ return self.filename + ":" + str(self.linenumber)
def readfullline(self):
+ """ Read a full line """
try:
- line = next(self.f)
+ line = next(self.fileno)
self.linenumber += 1
except StopIteration:
return None
txt = line
while len(line) > 1 and line[-2] == "\\":
txt = txt[0:-1]
- line = next(self.f)
+ line = next(self.fileno)
self.linenumber += 1
txt += line[0:-1]
return txt
-#keep the state of tesh (mostly configuration values)
class TeshState(Singleton):
+ """ Keep the state of tesh (mostly configuration values) """
def __init__(self):
+ self.running_pids = list() # stores which process group should be killed (or None otherwise)
self.threads = []
self.args_suffix = ""
self.ignore_regexps_common = []
- self.jenkins = False # not a Jenkins run by default
- self.timeout = 10 # default value: 10 sec
+ self.jenkins = False # not a Jenkins run by default
+ self.timeout = 10 # default value: 10 sec
self.wrapper = None
self.keep = False
+ self.return_code = 0
def add_thread(self, thread):
+ """ Add another thread to wait for """
self.threads.append(thread)
def join_all_threads(self):
- for t in self.threads:
- t.acquire()
- t.release()
+ """ Wait for all threads """
+ for thread in self.threads:
+ thread.acquire()
+ thread.release()
+
+ def set_return_code(self, value):
+ """ Set exit status """
+ if value > self.return_code:
+ self.return_code = value
-#Command line object
-class Cmd(object):
+
+class Cmd:
+ """ Command line object """
def __init__(self):
self.input_pipe = []
self.output_pipe_stdout = []
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
+ self.expect_return = [0]
self.output_display = False
self.ignore_regexps = TeshState().ignore_regexps_common
- def add_input_pipe(self, l):
- self.input_pipe.append(l)
+ def add_input_pipe(self, line):
+ """ Add a line to stdin input """
+ self.input_pipe.append(line)
- def add_output_pipe_stdout(self, l):
- self.output_pipe_stdout.append(l)
+ def add_output_pipe_stdout(self, line):
+ """ Add a line to stdout output """
+ self.output_pipe_stdout.append(line)
- def add_output_pipe_stderr(self, l):
- self.output_pipe_stderr.append(l)
+ def add_output_pipe_stderr(self, line):
+ """ Add a line to stderr output """
+ self.output_pipe_stderr.append(line)
def set_cmd(self, args, linenumber):
+ """ Set command line """
self.args = args
self.linenumber = linenumber
def add_ignore(self, txt):
+ """ Add regexp to ignore lines """
self.ignore_regexps.append(re.compile(txt))
def remove_ignored_lines(self, lines):
+ """ Remove ignored lines """
for ign in self.ignore_regexps:
- lines = [l for l in lines if not ign.match(l)]
+ lines = [l for l in lines if not ign.match(l)]
return lines
-
def _cmd_mkfile(self, argline):
filename = argline[len("mkfile "):]
file = open(filename, "w")
if file is None:
- fatal_error("Unable to create file "+filename)
+ fatal_error("Unable to create file " + filename)
file.write("\n".join(self.input_pipe))
file.write("\n")
file.close()
- def _cmd_cd(self, argline):
+ def _cmd_cd(self, argline): # pylint: disable=no-self-use
args = shlex.split(argline)
if len(args) != 2:
fatal_error("Too many arguments to cd")
try:
os.chdir(args[1])
- print("[Tesh/INFO] change directory to "+args[1])
+ print("[Tesh/INFO] change directory to " + args[1])
except FileNotFoundError:
- print("Chdir to "+args[1]+" failed: No such file or directory")
- print("Test suite `"+FileReader().filename+"': NOK (system error)")
+ print("Chdir to " + args[1] + " failed: No such file or directory")
+ print("Test suite `" + FileReader().filename + "': NOK (system error)")
tesh_exit(4)
-
- #Run the Cmd if possible.
- # Return False if nothing has been ran.
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)
- _thread.start_new_thread( Cmd._run, (self, lock) )
- else:
- self._run()
- return True
- else:
+ """
+ Run the Cmd if possible.
+ Return False if nothing has been ran.
+ """
+ if not self.can_run():
return False
-
+ if self.background:
+ lock = _thread.allocate_lock()
+ lock.acquire()
+ TeshState().add_thread(lock)
+ _thread.start_new_thread(Cmd._run, (self, lock))
+ else:
+ self._run()
+ return True
def _run(self, lock=None):
- #Python threads loose the cwd
- if self.cwd is not None:
- os.chdir(self.cwd)
- self.cwd = None
-
- #retrocompatibility: support ${aaa:=.} variable format
- def replace_perl_variables(m):
- vname = m.group(1)
- vdefault = m.group(2)
+ # Python threads loose the cwd
+ os.chdir(self.cwd)
+
+ # retrocompatibility: support ${aaa:=.} variable format
+ def replace_perl_variables(arg):
+ vname = arg.group(1)
+ vdefault = arg.group(2)
if vname in os.environ:
- return "$"+vname
- else:
- return vdefault
+ return "$" + vname
+ return vdefault
+
self.args = re.sub(r"\${(\w+):=([^}]*)}", replace_perl_variables, self.args)
- #replace bash environment variables ($THINGS) to their values
+ # replace bash environment variables ($THINGS) to their values
self.args = expandvars2(self.args)
if re.match("^mkfile ", self.args) is not None:
self._cmd_mkfile(self.args)
- if lock is not None: lock.release()
+ if lock is not None:
+ lock.release()
return
if re.match("^cd ", self.args) is not None:
self._cmd_cd(self.args)
- if lock is not None: lock.release()
+ if lock is not None:
+ lock.release()
return
if TeshState().wrapper is not None:
self.args = TeshState().wrapper + self.args
elif re.match(".*smpirun.*", self.args) is not None:
self.args = "sh " + self.args
- if TeshState().jenkins and self.timeout != None:
+ if TeshState().jenkins and self.timeout is not None:
self.timeout *= 10
self.args += TeshState().args_suffix
- print("["+FileReader().filename+":"+str(self.linenumber)+"] "+self.args)
+ logs = list()
+ logs.append("[{file}:{number}] {args}".format(file=FileReader().filename,
+ number=self.linenumber, args=self.args))
args = shlex.split(self.args)
- #print (args)
+
+ local_pid = None
try:
- proc = subprocess.Popen(args, bufsize=1, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True)
+ preexec_function = lambda: os.setpgid(0, 0)
+ proc = subprocess.Popen( # pylint: disable=subprocess-popen-preexec-fn
+ args,
+ bufsize=1,
+ stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ universal_newlines=True,
+ preexec_fn=preexec_function)
+ local_pid = proc.pid
+ TeshState().running_pids.append(local_pid)
+ except PermissionError:
+ logs.append("[{file}:{number}] Cannot start '{cmd}': The binary is not executable.".format(
+ file=FileReader().filename, number=self.linenumber, cmd=args[0]))
+ logs.append("[{file}:{number}] Current dir: {dir}".format(file=FileReader().filename,
+ number=self.linenumber, dir=os.getcwd()))
+ TeshState().set_return_code(3)
+ print('\n'.join(logs))
+ return
+ except NotADirectoryError:
+ logs.append("[{file}:{number}] Cannot start '{cmd}': The path to binary does not exist.".format(
+ file=FileReader().filename, number=self.linenumber, cmd=args[0]))
+ logs.append("[{file}:{number}] Current dir: {dir}".format(file=FileReader().filename,
+ number=self.linenumber, dir=os.getcwd()))
+ TeshState().set_return_code(3)
+ print('\n'.join(logs))
+ return
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)"
- raise osE
+ logs.append("[{file}:{number}] Cannot start '{cmd}': File not found.".format(
+ file=FileReader().filename, number=self.linenumber, cmd=args[0]))
+ TeshState().set_return_code(3)
+ print('\n'.join(logs))
+ return
+ except OSError as err:
+ if err.errno == 8:
+ err.strerror += \
+ "\nOSError: [Errno 8] Executed scripts should start with shebang line (like #!/usr/bin/env sh)"
+ raise err
- cmdName = FileReader().filename+":"+str(self.linenumber)
+ cmd_name = FileReader().filename + ":" + str(self.linenumber)
try:
- (stdout_data, stderr_data) = proc.communicate("\n".join(self.input_pipe), self.timeout)
+ (stdout_data, _stderr_data) = proc.communicate("\n".join(self.input_pipe), self.timeout)
+ timeout_reached = False
except subprocess.TimeoutExpired:
- print("Test suite `"+FileReader().filename+"': NOK (<"+cmdName+"> timeout after "+str(self.timeout)+" sec)")
- proc.kill()
- tesh_exit(3)
+ timeout_reached = True
+ logs.append("Test suite `{file}': NOK (<{cmd}> timeout after {timeout} sec)".format(
+ file=FileReader().filename, cmd=cmd_name, timeout=self.timeout))
+ TeshState().running_pids.remove(local_pid)
+ kill_process_group(local_pid)
+ # Try to get the output of the timeout process, to help in debugging.
+ try:
+ (stdout_data, _stderr_data) = proc.communicate(timeout=1)
+ except subprocess.TimeoutExpired:
+ logs.append("[{file}:{number}] Could not retrieve output. Killing the process group failed?".format(
+ file=FileReader().filename, number=self.linenumber))
+ TeshState().set_return_code(3)
+ print('\n'.join(logs))
+ return
if self.output_display:
- print(stdout_data)
+ logs.append(str(stdout_data))
- #remove text colors
+ # remove text colors
ansi_escape = re.compile(r'\x1b[^m]*m')
stdout_data = ansi_escape.sub('', stdout_data)
- #print ((stdout_data, stderr_data))
-
if self.ignore_output:
- print("(ignoring the output of <"+cmdName+"> as requested)")
+ logs.append("(ignoring the output of <{cmd}> as requested)".format(cmd=cmd_name))
else:
stdouta = stdout_data.split("\n")
- while len(stdouta) > 0 and stdouta[-1] == "":
- del stdouta[-1]
stdouta = self.remove_ignored_lines(stdouta)
+ while stdouta and stdouta[-1] == "":
+ del stdouta[-1]
stdcpy = stdouta[:]
# Mimic the "sort" bash command, which is case unsensitive.
stdouta.sort(key=lambda x: x[:self.sort].lower())
self.output_pipe_stdout.sort(key=lambda x: x[:self.sort].lower())
- diff = list(difflib.unified_diff(self.output_pipe_stdout, stdouta,lineterm="",fromfile='expected', tofile='obtained'))
- if len(diff) > 0:
- print("Output of <"+cmdName+"> mismatch:")
- if self.sort >= 0: # If sorted, truncate the diff output and show the unsorted version
- difflen = 0;
+ diff = list(
+ difflib.unified_diff(
+ self.output_pipe_stdout,
+ stdouta,
+ lineterm="",
+ fromfile='expected',
+ tofile='obtained'))
+ if diff:
+ logs.append("Output of <{cmd}> mismatch:".format(cmd=cmd_name))
+ if self.sort >= 0: # If sorted, truncate the diff output and show the unsorted version
+ difflen = 0
for line in diff:
- if difflen<50:
+ if difflen < 50:
print(line)
difflen += 1
if difflen > 50:
- print("(diff truncated after 50 lines)")
- print("Unsorted observed output:\n")
+ logs.append("(diff truncated after 50 lines)")
+ logs.append("Unsorted observed output:\n")
for line in stdcpy:
- print(line)
- else: # If not sorted, just display the diff
+ logs.append(line)
+ else: # If not sorted, just display the diff
for line in diff:
- print(line)
+ logs.append(line)
- print("Test suite `"+FileReader().filename+"': NOK (<"+cmdName+"> output mismatch)")
- if lock is not None: lock.release()
+ logs.append("Test suite `{file}': NOK (<{cmd}> output mismatch)".format(
+ file=FileReader().filename, cmd=cmd_name))
+ if lock is not None:
+ lock.release()
if TeshState().keep:
- f = open('obtained','w')
+ file = open('obtained', 'w')
obtained = stdout_data.split("\n")
- while len(obtained) > 0 and obtained[-1] == "":
+ while obtained and obtained[-1] == "":
del obtained[-1]
obtained = self.remove_ignored_lines(obtained)
for line in obtained:
- f.write("> "+line+"\n")
- f.close()
- print("Obtained output kept as requested: "+os.path.abspath("obtained"))
- tesh_exit(2)
-
- #print ((proc.returncode, self.expect_return))
+ file.write("> " + line + "\n")
+ file.close()
+ logs.append("Obtained output kept as requested: {path}".format(path=os.path.abspath("obtained")))
+ TeshState().set_return_code(2)
+ print('\n'.join(logs))
+ return
+
+ if timeout_reached:
+ TeshState().set_return_code(3)
+ print('\n'.join(logs))
+ return
- if proc.returncode != self.expect_return:
+ if not proc.returncode in self.expect_return:
if proc.returncode >= 0:
- print("Test suite `"+FileReader().filename+"': NOK (<"+cmdName+"> returned code "+str(proc.returncode)+")")
- if lock is not None: lock.release()
- tesh_exit(2)
- else:
- print("Test suite `"+FileReader().filename+"': NOK (<"+cmdName+"> got signal "+SIGNALS_TO_NAMES_DICT[-proc.returncode]+")")
- if lock is not None: lock.release()
- tesh_exit(-proc.returncode)
-
- if lock is not None: lock.release()
+ logs.append("Test suite `{file}': NOK (<{cmd}> returned code {code})".format(
+ file=FileReader().filename, cmd=cmd_name, code=proc.returncode))
+ if lock is not None:
+ lock.release()
+ TeshState().set_return_code(2)
+ print('\n'.join(logs))
+ return
+
+ logs.append("Test suite `{file}': NOK (<{cmd}> got signal {sig})".format(
+ file=FileReader().filename, cmd=cmd_name,
+ sig=SIGNALS_TO_NAMES_DICT[-proc.returncode]))
+ if lock is not None:
+ lock.release()
+ TeshState().set_return_code(max(-proc.returncode, 1))
+ print('\n'.join(logs))
+ return
+ if lock is not None:
+ lock.release()
+ print('\n'.join(logs))
def can_run(self):
+ """ Check if ready to run """
return self.args is not None
-
-
-
##############
#
# Main
#
#
+def main():
+ """ main function """
+ signal.signal(signal.SIGINT, signal_handler)
+ signal.signal(signal.SIGTERM, signal_handler)
-
-if __name__ == '__main__':
-
- parser = argparse.ArgumentParser(description='tesh -- testing shell', add_help=True)
+ parser = argparse.ArgumentParser(description='tesh -- testing shell')
group1 = parser.add_argument_group('Options')
group1.add_argument('teshfile', nargs='?', help='Name of teshfile, stdin if omitted')
- group1.add_argument('--cd', metavar='some/directory', help='ask tesh to switch the working directory before launching the tests')
+ group1.add_argument(
+ '--cd',
+ metavar='some/directory',
+ help='ask tesh to switch the working directory before launching the tests')
group1.add_argument('--setenv', metavar='var=value', action='append', help='set a specific environment variable')
group1.add_argument('--cfg', metavar='arg', action='append', help='add parameter --cfg=arg to each command line')
group1.add_argument('--log', metavar='arg', action='append', help='add parameter --log=arg to each command line')
- group1.add_argument('--ignore-jenkins', action='store_true', help='ignore all cruft generated on SimGrid continous integration servers')
+ group1.add_argument(
+ '--ignore-jenkins',
+ action='store_true',
+ help='ignore all cruft generated on SimGrid continuous integration servers')
group1.add_argument('--wrapper', metavar='arg', help='Run each command in the provided wrapper (eg valgrind)')
- group1.add_argument('--keep', action='store_true', help='Keep the obtained output when it does not match the expected one')
+ group1.add_argument(
+ '--keep',
+ action='store_true',
+ help='Keep the obtained output when it does not match the expected one')
- try:
- options = parser.parse_args()
- except:
- tesh_exit(1)
+ options = parser.parse_args()
if options.cd is not None:
+ print("[Tesh/INFO] change directory to " + options.cd)
os.chdir(options.cd)
if options.ignore_jenkins:
- print("Ignore all cruft seen on SimGrid's continous integration servers")
+ print("Ignore all cruft seen on SimGrid's continuous 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 .*"),
- ]
- TeshState().jenkins = True # This is a Jenkins build
+ 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 "),
+ 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 .*"),
+ # Seen on CircleCI
+ re.compile(r"cmake: /usr/local/lib/libcurl\.so\.4: no version information available \(required by cmake\)"),
+ 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
if options.teshfile is None:
- f = FileReader(None)
+ file = FileReader(None)
print("Test suite from stdin")
else:
if not os.path.isfile(options.teshfile):
- print("Cannot open teshfile '"+options.teshfile+"': File not found")
+ print("Cannot open teshfile '" + options.teshfile + "': File not found")
tesh_exit(3)
- f = FileReader(options.teshfile)
- print("Test suite '"+f.abspath+"'")
+ file = FileReader(options.teshfile)
+ print("Test suite '" + file.abspath + "'")
if options.setenv is not None:
- for e in options.setenv:
- setenv(e)
+ for env in options.setenv:
+ setenv(env)
if options.cfg is not None:
- for c in options.cfg:
- TeshState().args_suffix += " --cfg=" + c
+ for cfg in options.cfg:
+ TeshState().args_suffix += " --cfg=" + cfg
if options.log is not None:
- for l in options.log:
- TeshState().args_suffix += " --log=" + l
+ for log in options.log:
+ TeshState().args_suffix += " --log=" + log
if options.wrapper is not None:
TeshState().wrapper = options.wrapper
if options.keep:
TeshState().keep = True
- #cmd holds the current command line
+ # cmd holds the current command line
# tech commands will add some parameters to it
# when ready, we execute it.
cmd = Cmd()
- line = f.readfullline()
+ line = file.readfullline()
while line is not None:
- #print(">>============="+line+"==<<")
- if len(line) == 0:
+ # print(">>============="+line+"==<<")
+ if not line:
#print ("END CMD block")
if cmd.run_if_possible():
cmd = Cmd()
pass
elif line[0:2] == "p ":
- print("["+str(FileReader())+"] "+line[2:])
+ print("[" + str(FileReader()) + "] " + line[2:])
elif line[0:2] == "< ":
cmd.add_input_pipe(line[2:])
elif line[0:2] == "$ ":
if cmd.run_if_possible():
cmd = Cmd()
- cmd.set_cmd(line[2:], f.linenumber)
+ cmd.set_cmd(line[2:], file.linenumber)
elif line[0:2] == "& ":
if cmd.run_if_possible():
cmd = Cmd()
- cmd.set_cmd(line[2:], f.linenumber)
+ cmd.set_cmd(line[2:], file.linenumber)
cmd.background = True
elif line[0:15] == "! output ignore":
cmd.output_display = True
cmd.ignore_output = True
elif line[0:15] == "! expect return":
- cmd.expect_return = int(line[16:])
+ cmd.expect_return = [int(line[16:])]
#print("expect return "+str(int(line[16:])))
elif line[0:15] == "! expect signal":
- sig = line[16:]
- #get the signal integer value from the signal module
- if sig not in signal.__dict__:
- fatal_error("unrecognized signal '"+sig+"'")
- sig = int(signal.__dict__[sig])
- #popen return -signal when a process ends with a signal
- cmd.expect_return = -sig
+ cmd.expect_return = []
+ for sig in (line[16:]).split("|"):
+ # get the signal integer value from the signal module
+ if sig not in signal.__dict__:
+ fatal_error("unrecognized signal '" + sig + "'")
+ sig = int(signal.__dict__[sig])
+ # popen return -signal when a process ends with a signal
+ cmd.expect_return.append(-sig)
elif line[0:len("! timeout ")] == "! timeout ":
if "no" in line[len("! timeout "):]:
cmd.timeout = None
else:
fatal_error("UNRECOGNIZED OPTION")
-
- line = f.readfullline()
+ line = file.readfullline()
cmd.run_if_possible()
TeshState().join_all_threads()
- if f.filename == "(stdin)":
- print("Test suite from stdin OK")
- else:
- print("Test suite `"+f.filename+"' OK")
+ if TeshState().return_code == 0:
+ if file.filename == "(stdin)":
+ print("Test suite from stdin OK")
+ else:
+ print("Test suite `" + file.filename + "' OK")
+ tesh_exit(TeshState().return_code)
+
+if __name__ == '__main__':
+ main()
