Pass --latex-cmd through test run script

Austin Clements · Austin Clements · commit f4e2228e70a4 · 2014-07-23T19:27:56.000-04:00
diff --git a/test/run b/test/run
@@ -7,24 +7,30 @@ import subprocess
 import re
 import difflib
 import shutil
+import shlex
 
 failures = 0
 
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument('--latexrun', default='../latexrun',
                         help='Path to latexrun (default: %(default)s)')
+    parser.add_argument('--latex-cmd', help='Passed to latexrun')
     parser.add_argument('input', nargs='*', help='Input test file')
     args = parser.parse_args()
 
+    latexrun_args = []
+    if args.latex_cmd is not None:
+        latexrun_args.extend(['--latex-cmd', args.latex_cmd])
+
     os.makedirs('output', exist_ok=True)
 
     for inp in args.input:
-        test(args.latexrun, inp)
+        test(args.latexrun, latexrun_args, inp)
 
     sys.exit(1 if failures else 0)
 
-def check(label, passed=False, passed_expect=True):
+def check(label, latexrun_args, passed=False, passed_expect=True):
     global failures
     if passed_expect and not passed:
         failures += 1
@@ -34,11 +40,12 @@ def check(label, passed=False, passed_expect=True):
                   (False, False): ('BROKEN', 3),
                   (True, True): ('PASS', 2)}[(passed, passed_expect)]
 
+    label += ''.join(' ' + shlex.quote(a) for a in latexrun_args)
     print('\x1b[1;3%dm%-6s\x1b[0m %s' % (color, msg, label))
 
 INDENT = 7 * ' '
 
-def test(latexrun_path, input_path):
+def test(latexrun_path, latexrun_args, input_path):
     testname = os.path.splitext(input_path.split('/')[0])[0]
 
     # Get expectations
@@ -77,15 +84,15 @@ def test(latexrun_path, input_path):
     latexrun_path = os.path.relpath(latexrun_path, start=input_dir)
 
     p = subprocess.Popen([latexrun_path, '-o', outpath,
-                          os.path.basename(input_path)],
+                          os.path.basename(input_path)] + latexrun_args,
                          stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
                          cwd = input_dir or None)
     output = p.stdout.read().decode('ascii', errors='surrogateescape')
     status = p.wait()
 
     # Check results
     if output != output_expect:
-        check(testname, False, passed_expect)
+        check(testname, latexrun_args, False, passed_expect)
         open('output/%s.output' % testname, 'w', errors='surrogateescape')\
             .write(output)
         msg = []
@@ -104,10 +111,10 @@ def test(latexrun_path, input_path):
         sys.stdout.buffer.write('\n'.join(msg).encode(errors='surrogateescape'))
         print()
     elif status != status_expect:
-        check(testname, False, passed_expect)
+        check(testname, latexrun_args, False, passed_expect)
         print(INDENT + 'Expected status %d, got %d' % (status_expect, status))
     else:
-        check(testname, True, passed_expect)
+        check(testname, latexrun_args, True, passed_expect)
 
 if __name__ == '__main__':
     main()
