From c2092abbb945b55c87976d6d57ec2f728306af89 Mon Sep 17 00:00:00 2001
From: Clément Pit--Claudel <clement.pitclaudel@live.com>
Date: Thu, 23 Jul 2015 11:59:33 -0700
Subject: Let runTests.py generate expect files

That is, missing expect files now raise a warning, not an error.
---
 Test/runTests.py | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

(limited to 'Test/runTests.py')

diff --git a/Test/runTests.py b/Test/runTests.py
index 02a6f039..34a9c4de 100644
--- a/Test/runTests.py
+++ b/Test/runTests.py
@@ -138,8 +138,12 @@ class Test:
 
     @staticmethod
     def read_normalize(path):
-        with open(path, mode="rb") as reader:
-            return reader.read().replace(b'\r\n', b'\n').replace(b'\r', b'\n')
+        try:
+            with open(path, mode="rb") as reader:
+                return reader.read().replace(b'\r\n', b'\n').replace(b'\r', b'\n')
+        except FileNotFoundError:
+            debug(Debug.WARNING, "{} not found".format(path))
+            return ""
 
     @staticmethod
     def build_report(tests, name):
@@ -232,12 +236,12 @@ class Test:
 
     def report(self, tid, running, alltests):
         running = [alltests[rid].fname for rid in running]
-        # running = ", ".join(running if len(running) <= 2 else (running[:2] + ["..."]))
-        running = "; oldest thread: {}".format(wrap_color(running[0], Colors.DIM)) if running else ""
+        running = "; oldest thread: {}".format(running[0]) if running else ""
 
-        fstring = "[{:5.2f}s] {} ({} of {}{})"
+        fstring = "[{:5.2f}s] {} ({}{})"
+        progress = "{} of {}".format(tid, len(alltests))
         message = fstring.format(self.duration, wrap_color(self.dfy, Colors.BRIGHT),
-                                 tid, len(alltests), running)
+                                 wrap_color(progress, Colors.BRIGHT), running)
 
         debug(Debug.INFO, message, headers=self.status)
 
@@ -295,14 +299,14 @@ def setup_parser():
                         help="When comparing, include all timings.")
 
     parser.add_argument('--diff', '-d', action='store_const', const=True, default=False,
-                        help="Don't run tests; show differences for one file.")
+                        help="Don't run tests; show differences between outputs and .expect files, optionally overwritting .expect files.")
+
+    parser.add_argument('--accept', '-a', action='store_const', const=True, default=False,
+                        help="Don't run tests; copy outputs to .expect files.")
 
     parser.add_argument('--open', '-o', action='store_const', const=True, default=False,
                         help="Don't run tests; open one file.")
 
-    parser.add_argument('--accept', '-a', action='store_const', const=True, default=False,
-                        help="Used in conjuction with --diff, accept the new output.")
-
     parser.add_argument('--difftool', action='store', type=str, default="diff",
                         help='Diff program. Default: diff.')
 
@@ -346,10 +350,7 @@ def read_one_test(name, fname, compiler_cmds, timeout):
                 else:
                     break
         if cmds:
-            if os.path.exists(Test.source_to_expect_path(source_path)):
-                yield Test(name, source_path, cmds, timeout, cid)
-            else:
-                debug(Debug.DEBUG, "Test file {} has no .expect".format(fname))
+            yield Test(name, source_path, cmds, timeout, cid)
         else:
             debug(Debug.INFO, "Test file {} has no RUN specification".format(fname))
 
@@ -436,12 +437,16 @@ def diff(paths, accept, difftool):
             debug(Debug.ERROR, "Not found: {}".format(path))
         else:
             test = Test(None, path, [], None)
+
             if not accept:
                 call([difftool, test.expect_path, test.temp_output_path])
+                accept = input("Accept this change? (y/N) ") == "y"
 
-            if accept or input("Accept this change? (y/N) ") == "y":
-                debug(Debug.INFO, path, "Accepted")
+            if accept:
+                debug(Debug.INFO, path, "accepted.")
                 shutil.copy(test.temp_output_path, test.expect_path)
+            else:
+                debug(Debug.INFO, path, "not accepted.")
 
 def compare_results(globs, time_all):
     from glob import glob
@@ -486,7 +491,7 @@ def main():
     if os.name != 'nt' and os.environ.get("TERM") == "cygwin":
         debug(Debug.WARNING, "If you run into issues, try using Windows' Python instead of Cygwin's")
 
-    if args.diff:
+    if args.diff or args.accept:
         diff(args.paths, args.accept, args.difftool)
     elif args.open:
         os.startfile(args.paths[0])
-- 
cgit v1.2.3