Browse Source

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
Sam Delmerico 1 year ago
parent
commit
73d6bcc7bb
3 changed files with 5 additions and 3 deletions
  1. 1 1
      build_test.bash
  2. 1 1
      tests/apex_comparison_tests.sh
  3. 3 1
      tests/mixed_mode_test.sh

+ 1 - 1
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..."

+ 1 - 1
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 \

+ 3 - 1
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