File tree 1 file changed +11
-1
lines changed
1 file changed +11
-1
lines changed Original file line number Diff line number Diff line change 70
70
fi
71
71
72
72
function test_bootstrap() {
73
+ execute_bootstrap " --host_javabase=@local_jdk//:jdk"
74
+ }
75
+
76
+ # TODO(#7260): Remove this test once this flag is flipped
77
+ function test_bootstrap_with_cc_rules_using_platforms() {
78
+ execute_bootstrap " --host_javabase=@local_jdk//:jdk " \
79
+ " --incompatible_enable_cc_toolchain_resolution"
80
+ }
81
+
82
+ function execute_bootstrap() {
73
83
cd " $( mktemp -d ${TEST_TMPDIR} /bazelbootstrap.XXXXXXXX) "
74
84
export SOURCE_DATE_EPOCH=1501234567
75
85
unzip -q " ${DISTFILE} "
@@ -80,7 +90,7 @@ function test_bootstrap() {
80
90
fi
81
91
JAVABASE=$( echo reduced* )
82
92
83
- env EXTRA_BAZEL_ARGS=" --host_javabase=@local_jdk//:jdk " ./compile.sh \
93
+ env EXTRA_BAZEL_ARGS=" ${1} " ./compile.sh \
84
94
|| fail " Expected to be able to bootstrap bazel"
85
95
./output/bazel \
86
96
--server_javabase=$JAVABASE --host_jvm_args=--add-opens=java.base/java.nio=ALL-UNNAMED \
You can’t perform that action at this time.
0 commit comments