From f66c9895169090e05ba5d0d9fc9b191dc072c96f Mon Sep 17 00:00:00 2001 From: stijn Date: Mon, 30 Mar 2020 10:14:09 +0200 Subject: [PATCH] tests/run-tests: Make diff tool user configurable. --- tests/run-tests | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/run-tests b/tests/run-tests index 2240697b6d..831d2eab53 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -21,6 +21,9 @@ else: # mpy-cross is only needed if --via-mpy command-line arg is passed MPYCROSS = os.getenv('MICROPY_MPYCROSS', '../mpy-cross/mpy-cross') +# For diff'ing test output +DIFF = os.getenv('MICROPY_DIFF', 'diff -u') + # Set PYTHONIOENCODING so that CPython will use utf-8 on systems which set another encoding in the locale os.environ['PYTHONIOENCODING'] = 'utf-8' @@ -595,7 +598,7 @@ the last matching regex is used: testbase = os.path.basename(exp)[:-4] print() print("FAILURE {0}".format(testbase)) - os.system("diff -u {0}.exp {0}.out".format(testbase)) + os.system("{0} {1}.exp {1}.out".format(DIFF, testbase)) sys.exit(0)