X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/24a01805ccb4ff4df130b6314592776bfe946df7..e612178e5914b6c6cb9ab947e5a433f9a498ca22:/tools/tesh/tesh.py diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py index 4a635be0cb..7f3aca4df6 100755 --- a/tools/tesh/tesh.py +++ b/tools/tesh/tesh.py @@ -162,6 +162,7 @@ class TeshState(Singleton): self.threads = [] self.args_suffix = "" self.ignore_regexps_common = [] + self.wrapper = None def add_thread(self, thread): self.threads.append(thread) @@ -221,6 +222,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): @@ -283,13 +285,14 @@ class Cmd(object): if lock is not None: lock.release() return - self.args = TeshState().wrapper + self.args + TeshState().args_suffix - - print("["+FileReader().filename+":"+str(self.linenumber)+"] "+self.args) - if TeshState().wrapper is not None: self.timeout *= 20 + self.args = TeshState().wrapper + self.args + + self.args += TeshState().args_suffix + print("["+FileReader().filename+":"+str(self.linenumber)+"] "+self.args) + args = shlex.split(self.args) #print (args) try: