Skip to content

A
angle
Commit 2a09e891 by Jamie Madill Committed by Commit Bot
Options

Isolated script args in restricted trace tests.

This will allow us to pass CQ since CQ requires isolated script output args. We can also update this logic later to fail CQ if the golden image check fails. Bug: angleproject:4090 Bug: b/168049670 Change-Id: I81c5571e8742e641ebd8c9cbd8e1c89f583c725c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2423212Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent f0b0e3e8
Showing with 30 additions and 3 deletions
src/tests/restricted_traces/restricted_trace_gold_tests.py
...@@ -27,6 +27,7 @@ import os ...@@ -27,6 +27,7 @@ import os
import shutil import shutil
import sys import sys
import tempfile import tempfile
import time
import traceback import traceback
# Add //src/testing into sys.path for importing xvfb and test_env, and # Add //src/testing into sys.path for importing xvfb and test_env, and
...@@ -67,6 +68,7 @@ def temporary_dir(prefix=''): ...@@ -67,6 +68,7 @@ def temporary_dir(prefix=''):
def main(): def main():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('--isolated-script-test-output', type=str, required=True) parser.add_argument('--isolated-script-test-output', type=str, required=True)
parser.add_argument('--isolated-script-test-perf-output', type=str)
parser.add_argument('--test-suite', help='Test suite to run.', default=DEFAULT_TEST_SUITE) parser.add_argument('--test-suite', help='Test suite to run.', default=DEFAULT_TEST_SUITE)
parser.add_argument('--render-test-output-dir', help='Directory to store screenshots') parser.add_argument('--render-test-output-dir', help='Directory to store screenshots')
parser.add_argument('--xvfb', help='Start xvfb.', action='store_true') parser.add_argument('--xvfb', help='Start xvfb.', action='store_true')
...@@ -78,6 +80,22 @@ def main(): ...@@ -78,6 +80,22 @@ def main():
print('Sharding not yet implemented.') print('Sharding not yet implemented.')
sys.exit(1) sys.exit(1)
results = {
'tests': {
'angle_restricted_trace_gold_tests': {}
},
'interrupted': False,
'seconds_since_epoch': time.time(),
'path_delimiter': '.',
'version': 3,
'num_failures_by_type': {
'PASS': 0,
'FAIL': 0,
}
}
result_tests = results['tests']['angle_restricted_trace_gold_tests']
def run_tests(args, tests, extra_flags, env, screenshot_dir): def run_tests(args, tests, extra_flags, env, screenshot_dir):
for test in tests['traces']: for test in tests['traces']:
with common.temporary_file() as tempfile_path: with common.temporary_file() as tempfile_path:
...@@ -93,10 +111,11 @@ def main(): ...@@ -93,10 +111,11 @@ def main():
else: else:
rc = test_env.run_command_with_output(cmd, env=env, stdoutfile=tempfile_path) rc = test_env.run_command_with_output(cmd, env=env, stdoutfile=tempfile_path)
if rc != 0: pass_fail = 'PASS' if rc == 0 else 'FAIL'
return rc result_tests[test] = {'expected': 'PASS', 'actual': pass_fail}
results['num_failures_by_type'][pass_fail] += 1
return 0 return results['num_failures_by_type']['FAIL'] == 0
rc = 0 rc = 0
try: try:
...@@ -121,6 +140,14 @@ def main(): ...@@ -121,6 +140,14 @@ def main():
traceback.print_exc() traceback.print_exc()
rc = 1 rc = 1
if args.isolated_script_test_output:
with open(args.isolated_script_test_output, 'w') as out_file:
out_file.write(json.dumps(results))
if args.isolated_script_test_perf_output:
with open(args.isolated_script_test_perf_output, 'w') as out_file:
out_file.write(json.dumps({}))
return rc return rc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment