Skip to content

Commit cd16552

Browse files
committed
[test] Add reftest helper method for browser tests. NFC
This makes it easy distinguish reference tests from other btests.
1 parent 5355b8d commit cd16552

File tree

2 files changed

+185
-182
lines changed

2 files changed

+185
-182
lines changed

test/common.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2010,7 +2010,7 @@ def run_browser(self, html_file, expected=None, message=None, timeout=None, extr
20102010

20112011
# @manually_trigger If set, we do not assume we should run the reftest when main() is done.
20122012
# Instead, call doReftest() in JS yourself at the right time.
2013-
def reftest(self, expected, manually_trigger=False):
2013+
def make_reftest(self, expected, manually_trigger=False):
20142014
# make sure the pngs used here have no color correction, using e.g.
20152015
# pngcrush -rem gAMA -rem cHRM -rem iCCP -rem sRGB infile outfile
20162016
basename = os.path.basename(expected)
@@ -2141,8 +2141,15 @@ def compile_btest(self, filename, args, reporting=Reporting.FULL):
21412141
filename = test_file(filename)
21422142
self.run_process([compiler_for(filename), filename] + self.get_emcc_args() + args)
21432143

2144+
def reftest(self, filename, reference, *args, **kwargs):
2145+
"""Special case of `btest` that uses reference image
2146+
"""
2147+
assert 'reference' not in kwargs
2148+
kwargs['reference'] = reference
2149+
return self.btest(filename, *args, **kwargs)
2150+
21442151
def btest_exit(self, filename, assert_returncode=0, *args, **kwargs):
2145-
"""Special case of btest that reports its result solely via exiting
2152+
"""Special case of `btest` that reports its result solely via exiting
21462153
with a given result code.
21472154
21482155
In this case we set EXIT_RUNTIME and we don't need to provide the
@@ -2175,7 +2182,7 @@ def btest(self, filename, expected=None, reference=None,
21752182
if reference:
21762183
self.reference = reference
21772184
expected = [str(i) for i in range(0, reference_slack + 1)]
2178-
self.reftest(test_file(reference), manually_trigger=manually_trigger_reftest)
2185+
self.make_reftest(test_file(reference), manually_trigger=manually_trigger_reftest)
21792186
if not manual_reference:
21802187
args += ['--pre-js', 'reftest.js', '-sGL_TESTING']
21812188
else:

0 commit comments

Comments
 (0)