djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/run-multitests.py: Show test/truth diff.

This commit is contained in:
Jim Mussared 2020-09-14 18:11:19 +10:00
parent 857e2c8fd5
commit 06dda48144
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/run-multitests.py
View File

@ -7,6 +7,7 @@
import sys, os, time, re, select import sys, os, time, re, select
import argparse import argparse
import subprocess import subprocess
import tempfile
sys.path.append("../tools") sys.path.append("../tools")
import pyboard import pyboard
@ -18,6 +19,9 @@ else:
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3") CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/micropython") MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/micropython")
# For diff'ing test output
DIFF = os.getenv("MICROPY_DIFF", "diff -u")
PYTHON_TRUTH = CPYTHON3 PYTHON_TRUTH = CPYTHON3
INSTANCE_READ_TIMEOUT_S = 10 INSTANCE_READ_TIMEOUT_S = 10
@ -323,6 +327,18 @@ def run_test_on_instances(test_file, num_instances, instances):
return error, skip, output_str return error, skip, output_str
def print_diff(a, b):
a_fd, a_path = tempfile.mkstemp(text=True)
b_fd, b_path = tempfile.mkstemp(text=True)
os.write(a_fd, a.encode())
os.write(b_fd, b.encode())
os.close(a_fd)
os.close(b_fd)
subprocess.run(DIFF.split(" ") + [a_path, b_path])
os.unlink(a_path)
os.unlink(b_path)
def run_tests(test_files, instances_truth, instances_test): def run_tests(test_files, instances_truth, instances_test):
skipped_tests = [] skipped_tests = []
passed_tests = [] passed_tests = []
@ -372,6 +388,8 @@ def run_tests(test_files, instances_truth, instances_test):
print(output_test, end="") print(output_test, end="")
print("### TRUTH ###") print("### TRUTH ###")
print(output_truth, end="") print(output_truth, end="")
print("### DIFF ###")
print_diff(output_test, output_truth)
if cmd_args.show_output: if cmd_args.show_output:
print() print()