X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f5178970569ee007ef47bdbc4e54eb46378ed4c..57f540e16cb71c9fefc1ec77a0d8d6c05df9b39a:/tools/tesh/tesh.py?ds=sidebyside diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py index c5159cae1e..8f1cb4c022 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. @@ -29,7 +28,7 @@ under the terms of the license (GNU LGPL) which comes with this package. # print "WARNING: Output were only sorted using the $sort_prefix first chars.\n" # if ( $sort_prefix > 0 ); # print "WARNING: Use to sort by simulated date and process ID only.\n"; -# +# # print "----8<--------------- Begin of unprocessed observed output (as it should appear in file):\n"; # map {print "> $_\n"} @{$cmd{'unsorted got'}}; # print "--------------->8---- End of the unprocessed observed output.\n"; @@ -130,7 +129,7 @@ class FileReader(Singleton): self.filename = os.path.basename(filename) self.abspath = os.path.abspath(filename) self.f = open(self.filename_raw) - + self.linenumber = 0 def linenumber(self): @@ -163,6 +162,8 @@ class TeshState(Singleton): 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.wrapper = None self.keep = False @@ -180,7 +181,7 @@ class Cmd(object): self.input_pipe = [] self.output_pipe_stdout = [] self.output_pipe_stderr = [] - self.timeout = 5 + self.timeout = TeshState().timeout self.args = None self.linenumber = -1 @@ -291,7 +292,9 @@ class Cmd(object): 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 = "sh " + self.args + if TeshState().jenkins and self.timeout != None: + self.timeout *= 10 self.args += TeshState().args_suffix @@ -299,18 +302,23 @@ class Cmd(object): args = shlex.split(self.args) #print (args) + try: proc = subprocess.Popen(args, bufsize=1, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) - except OSError as e: - if e.errno == 8: - e.strerror += "\nOSError: [Errno 8] Executed scripts should start with shebang line (like #!/bin/sh)" - raise e + except FileNotFoundError: + print("["+FileReader().filename+":"+str(self.linenumber)+"] Cannot start '"+args[0]+"': File not found") + 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 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 (<"+cmdName+"> timeout after "+str(self.timeout)+" sec)") + proc.kill() exit(3) if self.output_display: @@ -329,7 +337,7 @@ class Cmd(object): while len(stdouta) > 0 and stdouta[-1] == "": del stdouta[-1] stdouta = self.remove_ignored_lines(stdouta) - stdcpy = self.output_pipe_stdout[:] + stdcpy = stdouta[:] # Mimic the "sort" bash command, which is case unsensitive. if self.sort == 0: @@ -340,20 +348,23 @@ class Cmd(object): 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: + if len(diff) > 0: print("Output of <"+cmdName+"> mismatch:") - difflen = 0; - for line in diff: - if difflen<250: - print(line) - difflen += 1 - if difflen > 100: - print("(diff truncated after 250 lines)") - if self.sort >= 0: + if self.sort >= 0: # If sorted, truncate the diff output and show the unsorted version + difflen = 0; + for line in diff: + if difflen<50: + print(line) + difflen += 1 + if difflen > 50: + print("(diff truncated after 50 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: @@ -407,7 +418,7 @@ 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('--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 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') @@ -425,12 +436,24 @@ if __name__ == '__main__': 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(".*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"), + + re.compile("Python runtime initialized with LC_CTYPE=C .*"), + ] + TeshState().jenkins = True # This is a Jenkins build if options.teshfile is None: f = FileReader(None) print("Test suite from stdin") else: + if not os.path.isfile(options.teshfile): + print("Cannot open teshfile '"+options.teshfile+"': File not found") + exit(3) f = FileReader(options.teshfile) print("Test suite '"+f.abspath+"'")