From bf0de1bb6ef32f064580e4d09ed1cd8931aac0fe Mon Sep 17 00:00:00 2001
From: Googler <hvd@google.com>
Date: Thu, 23 Nov 2023 00:54:53 -0800
Subject: [PATCH] Automated rollback of commit
 01f620599c6138de4b4551da92917148ab18efe3.

*** 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 https://github.com/bazelbuild/bazel/issues/20288

*** Original change description ***

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

Related https://github.com/bazelbuild/bazel/issues/20288

PiperOrigin-RevId: 584820138
Change-Id: I6f5157d7e72c539a5fdc81841a35543df473aa4a
---
 .bazelci/presubmit.yml             | 2 --
 src/test/shell/bazel/jdeps_test.sh | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 2b610589e0f61b..e10485c194e2b3 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -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
diff --git a/src/test/shell/bazel/jdeps_test.sh b/src/test/shell/bazel/jdeps_test.sh
index 98513409df9929..2776ebee9c4c88 100755
--- a/src/test/shell/bazel/jdeps_test.sh
+++ b/src/test/shell/bazel/jdeps_test.sh
@@ -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 ..