Skip to content

Commit

Permalink
Automated rollback of commit 01f6205.
Browse files Browse the repository at this point in the history
*** Reason for rollback ***

Fix jdeps_test RBE failure

The culprit change added a new class that presumably pushed us over the xargs arg limit. Unfortunately, jdeps does not support @argfile, so this change updates the command buffer size to twice the default on RBE.

Fixes #20288

*** Original change description ***

Disable //src/test/shell/bazel:jdeps_test on RBE build to fix presubmit

Related #20288

PiperOrigin-RevId: 584820138
Change-Id: I6f5157d7e72c539a5fdc81841a35543df473aa4a
  • Loading branch information
hvadehra authored and copybara-github committed Nov 23, 2023
1 parent 6d0716d commit bf0de1b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,6 @@ tasks:
- "-//src/test/shell/bazel/android:aapt_integration_test"
- "-//src/test/shell/bazel/android:aapt_integration_test_with_head_android_tools"
- "-//src/test/shell/bazel/android:aapt_integration_test_with_platforms"
# https://github.com/bazelbuild/bazel/issues/20288
- "-//src/test/shell/bazel:jdeps_test"
include_json_profile:
- build
- test
Expand Down
2 changes: 1 addition & 1 deletion src/test/shell/bazel/jdeps_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function test_jdeps() {
# src/test/shell/bazel/jdeps_class_denylist.txt.
find . -type f -iname \*class | \
grep -vFf "$denylist" | \
xargs ../jdk/reduced/bin/jdeps --list-reduced-deps --ignore-missing-deps | \
xargs -s 262144 ../jdk/reduced/bin/jdeps --list-reduced-deps --ignore-missing-deps | \
grep -v "unnamed module" > ../jdeps \
|| fail "Failed to run jdeps on non denylisted class files."
cd ..
Expand Down

0 comments on commit bf0de1b

Please sign in to comment.