X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/83c835b2eb41598eec5f17726a4cb15316604d27..b28ed03d61b64662a55af20fe2a31e7e4cab64c0:/tools/tesh/tesh.py diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py index 5f011b40f0..db3a4c9520 100755 --- a/tools/tesh/tesh.py +++ b/tools/tesh/tesh.py @@ -5,8 +5,7 @@ tesh -- testing shell ======================== -Copyright (c) 2012-2016. The SimGrid Team. -All rights reserved. +Copyright (c) 2012-2017. 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. @@ -48,11 +47,8 @@ import argparse if sys.version_info[0] == 3: import subprocess import _thread -elif sys.version_info[0] < 3: - import subprocess32 as subprocess - import thread as _thread else: - raise "This program has not been made to exist this long" + raise "This program is expected to run with Python3 only" @@ -131,6 +127,7 @@ class FileReader(Singleton): else: self.filename_raw = filename self.filename = os.path.basename(filename) + self.abspath = os.path.abspath(filename) self.f = open(self.filename_raw) self.linenumber = 0 @@ -165,6 +162,8 @@ class TeshState(Singleton): self.threads = [] self.args_suffix = "" self.ignore_regexps_common = [] + self.wrapper = None + self.keep = False def add_thread(self, thread): self.threads.append(thread) @@ -174,16 +173,13 @@ class TeshState(Singleton): t.acquire() t.release() - - - #Command line object class Cmd(object): def __init__(self): self.input_pipe = [] self.output_pipe_stdout = [] self.output_pipe_stderr = [] - self.timeout = 5 + self.timeout = 10 self.args = None self.linenumber = -1 @@ -227,6 +223,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): @@ -289,10 +286,16 @@ class Cmd(object): if lock is not None: lock.release() return + 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: @@ -302,10 +305,11 @@ class Cmd(object): e.strerror += "\nOSError: [Errno 8] Executed scripts should start with shebang line (like #!/bin/sh)" raise e + cmdName = FileReader().filename+":"+str(self.linenumber) try: (stdout_data, stderr_data) = proc.communicate("\n".join(self.input_pipe), self.timeout) except subprocess.TimeoutExpired: - print("Test suite `"+FileReader().filename+"': NOK (<"+FileReader().filename+":"+str(self.linenumber)+"> timeout after "+str(self.timeout)+" sec)") + print("Test suite `"+FileReader().filename+"': NOK (<"+cmdName+"> timeout after "+str(self.timeout)+" sec)") exit(3) if self.output_display: @@ -318,15 +322,15 @@ class Cmd(object): #print ((stdout_data, stderr_data)) if self.ignore_output: - print("(ignoring the output of <"+FileReader().filename+":"+str(self.linenumber)+"> as requested)") + print("(ignoring the output of <"+cmdName+"> as requested)") else: stdouta = stdout_data.split("\n") while len(stdouta) > 0 and stdouta[-1] == "": del stdouta[-1] stdouta = self.remove_ignored_lines(stdouta) + stdcpy = stdouta[:] - #the "sort" bash command is case unsensitive, - # we mimic its behaviour + # Mimic the "sort" bash command, which is case unsensitive. if self.sort == 0: stdouta.sort(key=lambda x: x.lower()) self.output_pipe_stdout.sort(key=lambda x: x.lower()) @@ -336,22 +340,45 @@ class Cmd(object): diff = list(difflib.unified_diff(self.output_pipe_stdout, stdouta,lineterm="",fromfile='expected', tofile='obtained')) if len(diff) > 0: - print("Output of <"+FileReader().filename+":"+str(self.linenumber)+"> mismatch:") - for line in diff: - print(line) - print("Test suite `"+FileReader().filename+"': NOK (<"+str(FileReader())+"> output mismatch)") + print("Output of <"+cmdName+"> mismatch:") + if self.sort >= 0: # If sorted, truncate the diff output and show the unsorted version + difflen = 0; + for line in diff: + if difflen<250: + print(line) + difflen += 1 + if difflen > 100: + print("(diff truncated after 250 lines)") + print("Unsorted observed output:\n") + for line in stdcpy: + print(line) + else: # If not sorted, just display the diff + for line in diff: + print(line) + + print("Test suite `"+FileReader().filename+"': NOK (<"+cmdName+"> output mismatch)") if lock is not None: lock.release() + if TeshState().keep: + f = open('obtained','w') + obtained = stdout_data.split("\n") + while len(obtained) > 0 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")) exit(2) #print ((proc.returncode, self.expect_return)) if proc.returncode != self.expect_return: if proc.returncode >= 0: - print("Test suite `"+FileReader().filename+"': NOK (<"+str(FileReader())+"> returned code "+str(proc.returncode)+")") + print("Test suite `"+FileReader().filename+"': NOK (<"+cmdName+"> returned code "+str(proc.returncode)+")") if lock is not None: lock.release() exit(2) else: - print("Test suite `"+FileReader().filename+"': NOK (<"+str(FileReader())+"> got signal "+SIGNALS_TO_NAMES_DICT[-proc.returncode]+")") + print("Test suite `"+FileReader().filename+"': NOK (<"+cmdName+"> got signal "+SIGNALS_TO_NAMES_DICT[-proc.returncode]+")") if lock is not None: lock.release() exit(-proc.returncode) @@ -365,12 +392,6 @@ class Cmd(object): - - - - - - ############## # # Main @@ -388,7 +409,9 @@ 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)') + 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() @@ -397,17 +420,27 @@ 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:.*"), + re.compile(".*Configuration change: Set \'contexts/"), + re.compile(".*Picked up JAVA_TOOL_OPTIONS.*"), + + re.compile("==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"), + ] if options.teshfile is None: f = FileReader(None) print("Test suite from stdin") else: f = FileReader(options.teshfile) - print("Test suite '"+f.filename+"'") + print("Test suite '"+f.abspath+"'") if options.setenv is not None: for e in options.setenv: @@ -417,7 +450,12 @@ if __name__ == '__main__': TeshState().args_suffix += " --cfg="+options.cfg if options.log is not None: TeshState().args_suffix += " --log="+options.log - + + if options.wrapper is not None: + TeshState().wrapper = options.wrapper + + if options.keep: + TeshState().keep = True #cmd holds the current command line # tech commands will add some parameters to it @@ -508,8 +546,3 @@ if __name__ == '__main__': print("Test suite from stdin OK") else: print("Test suite `"+f.filename+"' OK") - - - - -