From f650912c46a89c1e05d3eebdb65fb87ecc59ed32 Mon Sep 17 00:00:00 2001 From: Heejin Ahn Date: Fri, 6 May 2022 16:09:48 -0700 Subject: [PATCH] Make `do_run` tests functions consistent - `do_run` also sets `expected_output=None`, like `do_runf`. - `do_run`, `do_run_from_file`, and `do_run_in_out_file_test` now return the stdout+stderr output, like `do_runf`. --- tests/common.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/common.py b/tests/common.py index f4dfcb71eb4a7..e8910f41a04e0 100644 --- a/tests/common.py +++ b/tests/common.py @@ -1100,7 +1100,7 @@ def filtered_js_engines(self, js_engines=None): banned = [b[0] for b in self.banned_js_engines if b] return [engine for engine in js_engines if engine and engine[0] not in banned] - def do_run(self, src, expected_output, force_c=False, **kwargs): + def do_run(self, src, expected_output=None, force_c=False, **kwargs): if 'no_build' in kwargs: filename = src else: @@ -1109,21 +1109,21 @@ def do_run(self, src, expected_output, force_c=False, **kwargs): else: filename = 'src.cpp' write_file(filename, src) - self._build_and_run(filename, expected_output, **kwargs) + return self._build_and_run(filename, expected_output, **kwargs) def do_runf(self, filename, expected_output=None, **kwargs): return self._build_and_run(filename, expected_output, **kwargs) ## Just like `do_run` but with filename of expected output def do_run_from_file(self, filename, expected_output_filename, **kwargs): - self._build_and_run(filename, read_file(expected_output_filename), **kwargs) + return self._build_and_run(filename, read_file(expected_output_filename), **kwargs) def do_run_in_out_file_test(self, *path, **kwargs): srcfile = test_file(*path) out_suffix = kwargs.pop('out_suffix', '') outfile = shared.unsuffixed(srcfile) + out_suffix + '.out' expected = read_file(outfile) - self._build_and_run(srcfile, expected, **kwargs) + return self._build_and_run(srcfile, expected, **kwargs) ## Does a complete test - builds, runs, checks output, etc. def _build_and_run(self, filename, expected_output, args=[], output_nicerizer=None,