cmake: better error message

[simgrid.git] / tools / tesh / tesh.py

diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py
index 0beb5af..4e5645e 100755 (executable)
--- a/tools/tesh/tesh.py
+++ b/tools/tesh/tesh.py
@@ -128,6 +128,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
@@ -163,6 +164,7 @@ class TeshState(Singleton):
         self.args_suffix = ""
         self.ignore_regexps_common = []
         self.wrapper = None
+        self.keep = False
     
     def add_thread(self, thread):
         self.threads.append(thread)
@@ -343,6 +345,16 @@ class Cmd(object):
                     print(line)
                 print("Test suite `"+FileReader().filename+"': NOK (<"+str(FileReader())+"> 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))
@@ -386,6 +398,7 @@ if __name__ == '__main__':
     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('--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()
@@ -399,15 +412,15 @@ if __name__ == '__main__':
         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(".*WARNING: ASan doesn\'t fully support"),
+           re.compile("Unable to clean temporary file C:.*")]
     
     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:
@@ -420,6 +433,9 @@ if __name__ == '__main__':
 
     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