Commit a973eeac authored by Rakib M. Hasan's avatar Rakib M. Hasan Committed by Chromium LUCI CQ

weblayer, skew tests: Load compiled test APK's when running skew tests on a builder

This CL makes builder's load compiled test APK's when running skew
tests on a builder. This should fix issues with Client library
test failures like WebLayer CookieManagerTest#testSetCookieNotSet
since a change in the test was made to the main branch.

Bug: 1155565
Change-Id: I569f574b5e1f6fadfd85c9a0d33e5a54f89403b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2641304Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Rakib Hasan <rmhasan@google.com>
Cr-Commit-Position: refs/heads/master@{#846335}
parent 68f89b61
...@@ -167,20 +167,21 @@ def main(): ...@@ -167,20 +167,21 @@ def main():
'--output-directory', '--output-directory',
args.test_runner_outdir, args.test_runner_outdir,
'--runtime-deps-path', '--runtime-deps-path',
os.path.join(args.client_outdir, os.path.join(args.test_runner_outdir,
('gen.runtime/weblayer/browser/android/javatests/' + ('gen.runtime/weblayer/browser/android/javatests/' +
'weblayer_instrumentation_test_apk.runtime_deps')), 'weblayer_instrumentation_test_apk.runtime_deps')),
'--test-apk', '--test-apk',
os.path.join(args.client_outdir, 'apks/WebLayerInstrumentationTest.apk'), os.path.join(args.test_runner_outdir,
'apks/WebLayerInstrumentationTest.apk'),
'--test-jar', '--test-jar',
os.path.join(args.client_outdir, os.path.join(args.test_runner_outdir,
'test.lib.java/WebLayerInstrumentationTest.jar'), 'test.lib.java/WebLayerInstrumentationTest.jar'),
'--apk-under-test', '--apk-under-test',
os.path.join(args.client_outdir, 'apks/WebLayerShellSystemWebView.apk'), os.path.join(args.client_outdir, 'apks/WebLayerShellSystemWebView.apk'),
'--use-webview-provider', '--use-webview-provider',
os.path.join(args.implementation_outdir, 'apks/SystemWebView.apk'), os.path.join(args.implementation_outdir, 'apks/SystemWebView.apk'),
'--additional-apk', '--additional-apk',
os.path.join(args.client_outdir, 'apks/ChromiumNetTestSupport.apk')] os.path.join(args.test_runner_outdir, 'apks/ChromiumNetTestSupport.apk')]
cmd = [sys.executable, executable_path] + executable_args + remaining_args cmd = [sys.executable, executable_path] + executable_args + remaining_args
......
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