From 73d6bcc7bbd64169678f95acb236ffa10f727358 Mon Sep 17 00:00:00 2001
From: Sam Delmerico <delmerico@google.com>
Date: Tue, 20 Sep 2022 15:31:37 -0400
Subject: [PATCH] Revert "Revert "run bp2build in mixed_mode_test.sh""

This reverts commit cb93d29aa99f62a55c5036c283bccd9ae8439032.

Reason for revert: retry this CL with additional changes in topic

Change-Id: Ibbb8926caef05c2177c06cb1c00795d407215f4a
---
 build_test.bash                | 2 +-
 tests/apex_comparison_tests.sh | 2 +-
 tests/mixed_mode_test.sh       | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build_test.bash b/build_test.bash
index 8b91e2c9d..6f0fba7d5 100755
--- a/build_test.bash
+++ b/build_test.bash
@@ -59,7 +59,7 @@ df -h || true
 
 echo
 echo "Running Bazel smoke test..."
-STANDALONE_BAZEL=true "${TOP}/tools/bazel" --batch --max_idle_secs=1 info
+STANDALONE_BAZEL=true "${TOP}/tools/bazel" --batch --max_idle_secs=1 help
 
 echo
 echo "Running Soong test..."
diff --git a/tests/apex_comparison_tests.sh b/tests/apex_comparison_tests.sh
index 6bc0165b7..61d131b9e 100755
--- a/tests/apex_comparison_tests.sh
+++ b/tests/apex_comparison_tests.sh
@@ -58,7 +58,7 @@ packages/modules/common/build/build_unbundled_mainline_module.sh \
 ######################
 build/soong/soong_ui.bash --make-mode BP2BUILD_VERBOSE=1 --skip-soong-tests bp2build
 
-BAZEL_OUT="$(call_bazel info output_path)"
+BAZEL_OUT="$(call_bazel info --config=bp2build output_path)"
 
 export TARGET_PRODUCT="module_arm"
 call_bazel build --config=bp2build --config=ci --config=android \
diff --git a/tests/mixed_mode_test.sh b/tests/mixed_mode_test.sh
index b408fd325..f6fffad4b 100755
--- a/tests/mixed_mode_test.sh
+++ b/tests/mixed_mode_test.sh
@@ -14,7 +14,9 @@ function test_bazel_smoke {
   setup
   create_mock_bazel
 
-  STANDALONE_BAZEL=true run_bazel info
+  run_soong bp2build
+
+  run_bazel info --config=bp2build
 }
 
 test_bazel_smoke