8000 Add loads to integration tests · coderabbit-test/bazel@b01670c · GitHub
[go: up one dir, main page]
Skip to content

Commit b01670c

Browse files
comiuscopybara-github
comius
authored and
copybara-github
committed
Add loads to integration tests
These are needed to flip --incompatible_disable_autoloads_in_main_repository PiperOrigin-RevId: 746413678 Change-Id: I09eb75a8d43986ae63d9bf1a3c1cda0ceeda1a97
1 parent 68277b3 commit b01670c

39 files changed

+482
-45
lines changed

‎src/test/py/bazel/first_time_use_test.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,20 @@ def _AssertBazelRunBinaryOutput(self, exit_code, stdout, stderr):
4646

4747
def testNoBashRequiredForSimpleBazelRun(self):
4848
"""Regression test for https://github.com/bazelbuild/bazel/issues/8229."""
49-
self.ScratchFile('foo/BUILD', [
50-
'py_binary(',
51-
' name = "x",'
52-
' srcs = ["x.py"],',
53-
' args = ["a", "\'b c\'"],',
54-
')',
55-
])
49+
self.ScratchFile(
50+
'MODULE.bazel', ["bazel_dep(name = 'rules_python', version = '0.40.0')"]
51+
)
52+
self.ScratchFile(
53+
'foo/BUILD',
54+
[
55+
'load("@rules_python//python:py_binary.bzl", "py_binary")',
56+
'py_binary(',
57+
' name = "x",',
58+
' srcs = ["x.py"],',
59+
' args = ["a", "\'b c\'"],',
60+
')',
61+
],
62+
)
5663
self.ScratchFile('foo/x.py', [
5764
'from __future__ import print_function',
5865
'import sys',

‎src/test/py/bazel/testdata/runfiles_test/MODULE.bazel.mock

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
bazel_dep(name = "rules_cc", version = "0.0.9")
2+
bazel_dep(name = "rules_java", version = "8.11.0")
23
bazel_dep(name = "rules_python", version = "0.36.0")
4+
bazel_dep(name = "rules_shell", version = "0.3.0")
5+
36
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
47
python.toolchain(python_version = "3.11")

‎src/test/py/bazel/testdata/runfiles_test/bar/BUILD.mock

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
2+
load("@rules_java//java:java_binary.bzl", "java_binary")
13
load("@rules_python//python:py_binary.bzl", "py_binary")
4+
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
25

36
package(default_visibility = ["//visibility:public"])
47

‎src/test/py/bazel/testdata/runfiles_test/foo/BUILD.mock

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
2+
load("@rules_java//java:java_binary.bzl", "java_binary")
13
load("@rules_python//python:py_binary.bzl", "py_binary")
4+
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
25

36
py_binary(
47
name = "runfiles-py",

‎src/test/shell/bazel/bazel_coverage_compatibility_test.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ source "${CURRENT_DIR}/../integration_test_setup.sh" \
2222
|| { echo "integration_test_setup.sh not found!" >&2; exit 1; }
2323

2424
function set_up_sh_test_coverage() {
25+
add_rules_shell "MODULE.bazel"
2526
cat <<EOF > BUILD
27+
load("@rules_shell//shell:sh_test.bzl", "sh_test")
28+
2629
constraint_setting(name = "incompatible_setting")
2730
2831
constraint_value(
@@ -60,6 +63,8 @@ EOF
6063

6164
mkdir all_incompatible/
6265
cat <<EOF > all_incompatible/BUILD
66+
load("@rules_shell//shell:sh_test.bzl", "sh_test")
67+
6368
sh_test(
6469
name = "incompatible1_test",
6570
srcs = ["//:incompatible_test.sh"],

‎src/test/shell/bazel/bazel_coverage_py_test.sh

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@ function is_gcov_missing_or_wrong_version() {
4343
}
4444

4545
function set_up_py_test_coverage() {
46+
add_rules_python "MODULE.bazel"
47+
add_rules_java "MODULE.bazel"
48+
4649
cat <<EOF > BUILD
50+
load("@rules_python//python:py_test.bzl", "py_test")
51+
load("@rules_python//python:py_library.bzl", "py_library")
52+
4753
py_test(
4854
name = "orange_test",
4955
srcs = ["orange_test.py"],
@@ -70,6 +76,9 @@ EOF
7076
mkdir -p java/com/google/orange
7177

7278
cat <<EOF > java/com/google/orange/BUILD
79+
load("@rules_java//java:java_binary.bzl", "java_binary")
80+
load("@rules_java//java:java_library.bzl", "java_library")
81+
7382
package(default_visibility = ["//visibility:public"])
7483
7584
java_binary(
@@ -159,8 +168,13 @@ function test_py_test_coverage_cc_binary() {
159168
echo "Skipping test." && return
160169
fi
161170

171+
add_rules_python "MODULE.bazel"
172+
add_rules_cc "MODULE.bazel"
173+
162174
########### Setup source files and BUILD file ###########
163175
cat <<EOF > BUILD
176+
load("@rules_python//python:py_test.bzl", "py_test")
177+
164178
py_test(
165179
name = "num_test",
166180
srcs = ["num_test.py"],
@@ -175,6 +189,9 @@ EOF
175189
mkdir -p examples/cpp
176190

177191
cat <<EOF > examples/cpp/BUILD
192+
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
193+
load("@rules_cc//cc:cc_library.bzl", "cc_library")
194+
178195
package(default_visibility = ["//visibility:public"])
179196
180197
cc_binary(
@@ -294,8 +311,14 @@ function test_py_test_coverage_cc_binary_and_java_binary() {
294311
echo "Skipping test." && return
295312
fi
296313

314+
add_rules_python "MODULE.bazel"
315+
add_rules_cc "MODULE.bazel"
316+
add_rules_java "MODULE.bazel"
317+
297318
########### Setup source files and BUILD file ###########
298319
cat <<EOF > BUILD
320+
load("@rules_python//python:py_test.bzl", "py_test")
321+
299322
py_test(
300323
name = "num_test",
301324
srcs = ["num_test.py"],
@@ -314,6 +337,9 @@ EOF
314337
mkdir -p examples/cpp
315338

316339
cat <<EOF > examples/cpp/BUILD
340+
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
341+
load("@rules_cc//cc:cc_library.bzl", "cc_library")
342+
317343
package(default_visibility = ["//visibility:public"])
318344
319345
cc_binary(
@@ -385,6 +411,9 @@ EOF
385411
mkdir -p java/com/google/orange
386412

387413
cat <<EOF > java/com/google/orange/BUILD
414+
load("@rules_java//java:java_binary.bzl", "java_binary")
415+
load("@rules_java//java:java_library.bzl", "java_library")
416+
388417
package(default_visibility = ["//visibility:public"])
389418
java_binary(
390419
name = "orange-bin",

‎src/test/shell/bazel/bazel_coverage_sh_test.sh

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,13 @@ source "${CURRENT_DIR}/coverage_helpers.sh" \
2525

2626

2727
function set_up_sh_test_coverage() {
28+
add_rules_shell "MODULE.bazel"
29+
add_rules_java "MODULE.bazel"
30+
2831
cat <<EOF > BUILD
32+
load("@rules_shell//shell:sh_test.bzl", "sh_test")
33+
load("@rules_shell//shell:sh_library.bzl", "sh_library")
34+
2935
sh_test(
3036
name = "orange-sh",
3137
srcs = ["orange-test.sh"],
@@ -56,6 +62,9 @@ EOF
5662
mkdir -p java/com/google/orange
5763

5864
cat <<EOF > java/com/google/orange/BUILD
65+
load("@rules_java//java:java_binary.bzl", "java_binary")
66+
load("@rules_java//java:java_library.bzl", "java_library")
67+
5968
package(default_visibility = ["//visibility:public"])
6069
6170
java_binary(
@@ -145,8 +154,13 @@ function test_sh_test_coverage_cc_binary() {
145154
echo "Skipping test." && return
146155
fi
147156

157+
add_rules_cc "MODULE.bazel"
158+
add_rules_shell "MODULE.bazel"
159+
148160
########### Setup source files and BUILD file ###########
149161
cat <<EOF > BUILD
162+
load("@rules_shell//shell:sh_test.bzl", "sh_test")
163+
150164
sh_test(
151165
name = "num-sh",
152166
srcs = ["num-test.sh"],
@@ -163,6 +177,9 @@ EOF
163177
mkdir -p examples/cpp
164178

165179
cat <<EOF > examples/cpp/BUILD
180+
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
181+
load("@rules_cc//cc:cc_library.bzl", "cc_library")
182+
166183
package(default_visibility = ["//visibility:public"])
167184
168185
cc_binary(
@@ -282,8 +299,14 @@ function test_sh_test_coverage_cc_binary_and_java_binary() {
282299
echo "Skipping test." && return
283300
fi
284301

302+
add_rules_shell "MODULE.bazel"
303+
add_rules_java "MODULE.bazel"
304+
add_rules_cc "MODULE.bazel"
305+
285306
########### Setup source files and BUILD file ###########
286307
cat <<EOF > BUILD
308+
load("@rules_shell//shell:sh_test.bzl", "sh_test")
309+
287310
sh_test(
288311
name = "num-sh",
289312
srcs = ["num-test.sh"],
@@ -304,6 +327,9 @@ EOF
304327
mkdir -p examples/cpp
305328

306329
cat <<EOF > examples/cpp/BUILD
330+
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
331+
load("@rules_cc//cc:cc_library.bzl", "cc_library")
332+
307333
package(default_visibility = ["//visibility:public"])
308334
309335
cc_binary(
@@ -375,6 +401,9 @@ EOF
375401
mkdir -p java/com/google/orange
376402

377403
cat <<EOF > java/com/google/orange/BUILD
404+
load("@rules_java//java:java_binary.bzl", "java_binary")
405+
load("@rules_java//java:java_library.bzl", "java_library")
406+
378407
package(default_visibility = ["//visibility:public"])
379408
java_binary(
380409
name = "orange-bin",
@@ -490,7 +519,10 @@ end_of_record"
490519
}
491520

492521
function test_coverage_as_tree_artifact() {
522+
add_rules_shell "MODULE.bazel"
493523
cat <<'EOF' > BUILD
524+
load("@rules_shell//shell:sh_test.bzl", "sh_test")
525+
494526
sh_test(
495527
name = "pull",
496528
srcs = ["pull-test.sh"],

‎src/test/shell/bazel/bazel_coverage_starlark_test.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ EOF
108108

109109

110110
function test_starlark_rule_with_custom_lcov_merger() {
111-
111+
add_rules_shell "MODULE.bazel"
112112
cat <<EOF > lcov_merger.sh
113113
for var in "\$@"
114114
do
@@ -139,6 +139,7 @@ EOF
139139

140140
cat <<EOF > BUILD
141141
load(":rules.bzl", "custom_test")
142+
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
142143
143144
sh_binary(
144145
name = "lcov_merger",
@@ -157,7 +158,7 @@ EOF
157158
}
158159

159160
function test_starlark_rule_with_configuration_field_lcov_merger_coverage_enabled() {
160-
161+
add_rules_shell "MODULE.bazel"
161162
cat <<EOF > lcov_merger.sh
162163
for var in "\$@"
163164
do
@@ -192,6 +193,7 @@ EOF
192193

193194
cat <<EOF > BUILD
194195
load(":rules.bzl", "custom_test")
196+
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
195197
196198
sh_binary(
197199
name = "lcov_merger",

‎src/test/shell/bazel/bazel_execlog_test.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,12 @@ EOF
120120
}
121121

122122
function test_empty_file_in_runfiles() {
123+
add_rules_python "MODULE.bazel"
123124
mkdir d
124125
touch d/main.py
125126
cat > BUILD <<'EOF'
127+
load("@rules_python//python:py_binary.bzl", "py_binary")
128+
126129
py_binary(
127130
name = "py_tool",
128131
main = "d/main.py",
@@ -204,7 +207,10 @@ EOF
204207
}
205208

206209
function test_coverage() {
210+
add_rules_shell "MODULE.bazel"
211+
207212
cat > BUILD <<'EOF'
213+
load("@rules_shell//shell:sh_test.bzl", "sh_test")
208214
sh_test(
209215
name = "test",
210216
srcs = ["test.sh"],

‎src/test/shell/bazel/bazel_execute_testlog.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ source "${CURRENT_DIR}/../integration_test_setup.sh" \
2323
|| { echo "integration_test_setup.sh not found!" >&2; exit 1; }
2424

2525
function test_execute_testlog() {
26+
add_rules_shell "MODULE.bazel"
2627
mkdir dir
2728
cat <<EOF > dir/test.sh
2829
#!/bin/sh
@@ -33,6 +34,7 @@ EOF
3334
chmod +x dir/test.sh
3435

3536
cat <<EOF > dir/BUILD
37+
load("@rules_shell//shell:sh_test.bzl", "sh_test")
3638
sh_test(
3739
name = "test",
3840
srcs = [ "test.sh" ],

‎src/test/shell/bazel/bazel_java17_test.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,16 @@ override_java_tools "${RULES_JAVA_REPO_NAME}" "${JAVA_TOOLS_ZIP}" "${JAVA_TOOLS_
6161
add_to_bazelrc "build --java_runtime_version=11"
6262
add_to_bazelrc "build --tool_java_runtime_version=11"
6363

64-
add_protobuf "MODULE.bazel"
64+
function set_up(){
65+
add_protobuf "MODULE.bazel"
66+
add_rules_java "MODULE.bazel"
67+
}
6568

6669
# Java source files version shall match --java_language_version_flag version.
6770
function test_java17_text_block() {
6871
mkdir -p java/main
6972
cat >java/main/BUILD <<EOF
73+
load("@rules_java//java:java_binary.bzl", "java_binary")
7074
java_binary(
7175
name = 'Javac17Example',
7276
srcs = ['Javac17Example.java'],
@@ -103,12 +107,13 @@ EOF
103107
}
104108

105109
function test_incompatible_system_classpath() {
106-
add_rules_java MODULE.bazel
107110
mkdir -p pkg
108111
# This test defines a custom Java toolchain as it relies on the availability of a runtime that is
109112
# strictly newer than the one specified as the toolchain's java_runtime.
110113
cat >pkg/BUILD <<'EOF'
111114
load("@bazel_tools//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain")
115+
load("@rules_java//java:java_binary.bzl", "java_binary")
116+
112117
java_binary(
113118
name = "Main",
114119
srcs = ["Main.java"],
@@ -150,6 +155,8 @@ function test_incompatible_tool_system_classpath() {
150155
# strictly newer than the one specified as the toolchain's java_runtime.
151156
cat >pkg/BUILD <<'EOF'
152157
load("@bazel_tools//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain")
158+
load("@rules_java//java:java_binary.bzl", "java_binary")
159+
153160
java_binary(
154161
name = "Main",
155162
srcs = ["Main.java"],

‎src/test/shell/bazel/bazel_with_jdk_test.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,11 @@ function set_up() {
8383
setup_bazelrc
8484
fi
8585

86+
add_rules_java "MODULE.bazel"
87+
8688
mkdir -p java/main
8789
cat >java/main/BUILD <<EOF
90+
load("@rules_java//java:java_binary.bzl", "java_binary")
8891
java_binary(
8992
name = 'JavaExample',
9093
srcs = ['JavaExample.java'],
@@ -279,7 +282,6 @@ EOF
279282

280283
# Bazel shall provide Java compilation toolchains that use local JDK.
281284
function test_bazel_compiles_with_localjdk() {
282-
add_rules_java "MODULE.bazel"
283285
cat >> MODULE.bazel <<EOF
284286
java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
285287
use_repo(java_toolchains, "local_jdk")

0 commit comments

Comments
 (0)
0