Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Respect custom --adb-binary for chrome_android-derived products #33654

Merged
merged 2 commits into from Apr 15, 2022

Conversation

jonathan-j-lee
Copy link
Contributor

Previously, chrome_android-derived products depended on finding a generic adb on the PATH. The Chromium infrastructure was changed to use --adb-binary instead of PATH pollution, but the option did not work as documented because wptrunner did not pass the option all the way through.

Context: https://chromium-review.googlesource.com/c/chromium/src/+/3578461. The Android wpt trybot I was using masked the bug: https://ci.chromium.org/ui/p/chromium/builders/try/android-weblayer-pie-x86-wpt-smoketest/2036/overview

I've tried this change in chromium/src in a shell without adb in PATH and verified that this change fixes the immediate error for chrome_android, android_webview, and android_weblayer. Looking at grep -R "[\"']adb[\"']" --exclude-dir='*venv' tools, I think there are no more instances of hardcoded generic adb.

Previously, `chrome_android`-derived products depended on finding a
generic `adb` on the `PATH`. The Chromium infrastructure was changed to
use `--adb-binary` instead of `PATH` pollution, but the option did not
work as documented because wptrunner did not pass the option all the way
through.
@wpt-pr-bot wpt-pr-bot added infra wpt wptrunner The automated test runner, commonly called through ./wpt run labels Apr 15, 2022
@jonathan-j-lee jonathan-j-lee enabled auto-merge (squash) April 15, 2022 17:58
@jonathan-j-lee jonathan-j-lee merged commit f7ffbe1 into master Apr 15, 2022
@jonathan-j-lee jonathan-j-lee deleted the chromium-use-adb-binary branch April 15, 2022 18:09
jonathan-j-lee added a commit that referenced this pull request Apr 18, 2022
The change #33654 caused `chrome_android`-related runs without
`--adb-binary` to fail because the corresponding kwarg was `None` but
present. Constructing the kwarg overwrote the kwarg default.

This change fixes that bug by using `None` to signal default `adb`
usage.
jonathan-j-lee added a commit that referenced this pull request Apr 18, 2022
The change #33654 caused `chrome_android`-related runs without
`--adb-binary` to fail because the corresponding kwarg was `None` but
present. Constructing the browser overwrote the kwarg default.

This change fixes that bug by using `None` to signal default `adb`
usage.
jonathan-j-lee added a commit that referenced this pull request Apr 18, 2022
The change #33654 caused `chrome_android`-related runs without
`--adb-binary` to fail because the corresponding kwarg was `None` but
present. Constructing the browser overwrote the kwarg default.

This change fixes that bug by using `None` to signal default `adb`
usage.
jonathan-j-lee added a commit that referenced this pull request Apr 18, 2022
…d products (#33669)

The change #33654 caused `chrome_android`-related runs without
`--adb-binary` to fail because the corresponding kwarg was `None` but
present. Constructing the browser overwrote the kwarg default.

This change fixes that bug by using `None` to signal default `adb`
usage.
DanielRyanSmith pushed a commit to DanielRyanSmith/wpt that referenced this pull request Apr 27, 2022
…eb-platform-tests#33654)

Previously, `chrome_android`-derived products depended on finding a
generic `adb` on the `PATH`. The Chromium infrastructure was changed to
use `--adb-binary` instead of `PATH` pollution, but the option did not
work as documented because wptrunner did not pass the option all the way
through.
DanielRyanSmith pushed a commit to DanielRyanSmith/wpt that referenced this pull request Apr 27, 2022
…d products (web-platform-tests#33669)

The change web-platform-tests#33654 caused `chrome_android`-related runs without
`--adb-binary` to fail because the corresponding kwarg was `None` but
present. Constructing the browser overwrote the kwarg default.

This change fixes that bug by using `None` to signal default `adb`
usage.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
infra wpt wptrunner The automated test runner, commonly called through ./wpt run
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants