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

Commit d762203

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: 746454406 Change-Id: Ia4d3068ffa45a3e8688a0dd967e5019cb34e3aee
1 parent 092fbd4 commit d762203

21 files changed

+350
-18
lines changed

‎src/test/shell/bazel/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@ sh_test(
925925

926926
sh_test(
927927
name = "empty_package_test",
928-
srcs = ["empty_package.sh"],
928+
srcs = ["empty_package_test.sh"],
929929
data = [":test-deps"],
930930
tags = ["no_windows"],
931931
)

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,11 @@ test_symlink_outside_still_checked() {
235235
mkdir main
236236
cd main
237237
setup_module_dot_bazel
238-
echo 'sh_test(name = "symlink", srcs = ["symlink.sh"])' > BUILD
238+
add_rules_shell "MODULE.bazel"
239+
cat > BUILD <<EOF
240+
load("@rules_shell//shell:sh_test.bzl", "sh_test")
241+
sh_test(name = "symlink", srcs = ["symlink.sh"])
242+
EOF
239243

240244
mkdir ../foo
241245
echo 'exit 0' > ../foo/foo.sh

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,10 @@ function test_cache_hit_on_source_edit_after_test_failure() {
9797
local -r CACHE_DIR="${TEST_TMPDIR}/cache"
9898
rm -rf "$CACHE_DIR"
9999

100+
add_rules_shell "MODULE.bazel"
100101
mkdir -p a
101102
cat > a/BUILD <<'EOF'
103+
load("@rules_shell//shell:sh_test.bzl", "sh_test")
102104
sh_test(
103105
name = "test",
104106
srcs = ["test.sh"],

‎src/test/shell/bazel/empty_package.sh renamed to ‎src/test/shell/bazel/empty_package_test.sh

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

2525
function test_empty_package() {
26+
add_rules_java "MODULE.bazel"
2627
cat > BUILD <<EOF
28+
load("@rules_java//java:java_binary.bzl", "java_binary")
29+
2730
java_binary(
2831
name = "noise",
2932
main_class = "Noise",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,10 @@ EOF
179179
}
180180

181181
function test_java_smoke_with_new_layouts() {
182+
add_rules_java "MODULE.bazel"
182183
mkdir -p external/java/a
183184
cat > external/java/a/BUILD <<EOF
185+
load("@rules_java//java:java_binary.bzl", "java_binary")
184186
java_binary(name='a', srcs=['A.java'])
185187
EOF
186188

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ add_to_bazelrc "build --package_path=%workspace%"
3434

3535

3636
function test_java_launcher_classpath_limit() {
37+
add_rules_java "MODULE.bazel"
3738
local -r pkg="${FUNCNAME[0]}"
3839
mkdir -p $pkg/java/hello || fail "Expected success"
3940
cat > $pkg/java/hello/HelloLib.java <<EOF
@@ -53,6 +54,9 @@ public class Hello {
5354
}
5455
EOF
5556
cat > $pkg/java/hello/BUILD <<EOF
57+
load("@rules_java//java:java_library.bzl", "java_library")
58+
load("@rules_java//java:java_binary.bzl", "java_binary")
59+
5660
java_library(
5761
name = "hellolib",
5862
srcs = ["HelloLib.java"],

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

Lines changed: 75 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,11 @@ EOF
9090
local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
9191
local_repository(name = 'pandas', path = '${repo2}')
9292
EOF
93+
add_rules_shell "MODULE.bazel"
9394

9495
cat > zoo/BUILD <<EOF
96+
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
97+
9598
sh_binary(
9699
name = "dumper",
97100
srcs = ["dumper.sh"],
@@ -130,6 +133,8 @@ function test_local_repository_java() {
130133

131134
mkdir -p carnivore
132135
cat > carnivore/BUILD <<EOF
136+
load("@rules_java//java:java_library.bzl", "java_library")
137+
133138
java_library(
134139
name = "mongoose",
135140
srcs = ["Mongoose.java"],
@@ -150,9 +155,11 @@ EOF
150155
local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
151156
local_repository(name = 'endangered', path = '$repo2')
152157
EOF
153-
158+
add_rules_java "MODULE.bazel"
154159
mkdir -p zoo
155160
cat > zoo/BUILD <<EOF
161+
load("@rules_java//java:java_binary.bzl", "java_binary")
162+
156163
java_binary(
157164
name = "ball-pit",
158165
srcs = ["BallPit.java"],
@@ -178,9 +185,12 @@ EOF
178185
}
179186

180187
function test_non_existent_external_ref() {
188+
add_rules_java "MODULE.bazel"
181189
mkdir -p zoo
182190
touch zoo/BallPit.java
183191
cat > zoo/BUILD <<EOF
192+
load("@rules_java//java:java_binary.bzl", "java_binary")
193+
184194
java_binary(
185195
name = "ball-pit",
186196
srcs = ["BallPit.java"],
@@ -236,8 +246,11 @@ new_local_repository(
236246
build_file = '//:BUILD.carnivore',
237247
)
238248
EOF
249+
add_rules_java "MODULE.bazel"
239250

240251
cat > BUILD.carnivore <<EOF
252+
load("@rules_java//java:java_library.bzl", "java_library")
253+
241254
java_library(
242255
name = "mongoose",
243256
srcs = ["carnivore/Mongoose.java"],
@@ -251,17 +264,22 @@ new_local_repository(
251264
name = 'endangered',
252265
path = '$project_dir',
253266
build_file_content = """
267+
load("@rules_java//java:java_library.bzl", "java_library")
268+
254269
java_library(
255270
name = "mongoose",
256271
srcs = ["carnivore/Mongoose.java"],
257272
visibility = ["//visibility:public"],
258273
)""",
259274
)
260275
EOF
276+
add_rules_java "MODULE.bazel"
261277
fi
262278

263279
mkdir -p zoo
264280
cat > zoo/BUILD <<EOF
281+
load("@rules_java//java:java_binary.bzl", "java_binary")
282+
265283
java_binary(
266284
name = "ball-pit",
267285
srcs = ["BallPit.java"],
@@ -314,6 +332,8 @@ void greet() {
314332
}
315333
EOF
316334
cat > $external_ws/BUILD <<EOF
335+
load("@rules_cc//cc:cc_library.bzl", "cc_library")
336+
317337
cc_library(
318338
name = "greet_lib",
319339
srcs = ["greet_lib.cc"],
@@ -334,6 +354,8 @@ int main() {
334354
}
335355
EOF
336356
cat > BUILD <<EOF
357+
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
358+
337359
cc_binary(
338360
name = "greeter",
339361
srcs = ["greeter.cc"],
@@ -347,6 +369,7 @@ local_repository(
347369
path = "$external_ws",
348370
)
349371
EOF
372+
add_rules_cc "MODULE.bazel"
350373

351374
bazel fetch //:greeter || fail "Fetch failed"
352375
bazel run //:greeter >& $TEST_log || fail "Failed to run greeter"
@@ -367,6 +390,8 @@ int x() {
367390
}
368391
EOF
369392
cat > $clib/BUILD <<EOF
393+
load("@rules_cc//cc:cc_library.bzl", "cc_library")
394+
370395
cc_library(
371396
name = "clib",
372397
srcs = ["clib.cc"],
@@ -383,7 +408,10 @@ local_repository(
383408
path = "$clib",
384409
)
385410
EOF
411+
add_rules_cc "MODULE.bazel"
386412
cat > BUILD <<EOF
413+
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
414+
387415
cc_binary(
388416
name = "printer",
389417
srcs = ["printer.cc"],
@@ -414,9 +442,16 @@ function test_repository_package_query() {
414442
local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
415443
local_repository(name='b', path='b')
416444
EOF
417-
echo "sh_library(name='a', deps=['@b//b'])" > a/BUILD
445+
add_rules_shell "MODULE.bazel"
446+
cat > a/BUILD <<EOF
447+
load("@rules_shell//shell:sh_library.bzl", "sh_library")
448+
sh_library(name='a', deps=['@b//b'])
449+
EOF
418450
touch b/REPO.bazel
419-
echo "sh_library(name='b')" > b/b/BUILD
451+
cat > b/b/BUILD <<EOF
452+
load("@rules_shell//shell:sh_library.bzl", "sh_library")
453+
sh_library(name='b')
454+
EOF
420455
bazel query --output package "deps(//a)" >& $TEST_log || fail "query failed"
421456
expect_log "a"
422457
expect_log "@b//b"
@@ -428,10 +463,17 @@ function test_repository_buildfiles_package_query() {
428463
local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
429464
local_repository(name='b', path='b')
430465
EOF
431-
echo "sh_library(name='a', deps=['@b//b'])" > a/BUILD
466+
add_rules_shell "MODULE.bazel"
467+
cat > a/BUILD <<EOF
468+
load("@rules_shell//shell:sh_library.bzl", "sh_library")
469+
470+
sh_library(name='a', deps=['@b//b'])
471+
EOF
432472
touch b/REPO.bazel b/c/BUILD
433473
cat > b/b/BUILD <<EOF
434474
load('//c:lib.bzl', 'x')
475+
load("@rules_shell//shell:sh_library.bzl", "sh_library")
476+
435477
sh_library(
436478
name = "b"
437479
)
@@ -737,9 +779,11 @@ EOF
737779
function test_python_in_remote_repository() {
738780
local r=$TEST_TMPDIR/r
739781
rm -fr $r
782+
add_rules_python "MODULE.bazel"
740783
mkdir -p $r/bin
741784
touch $r/REPO.bazel
742785
cat > $r/bin/BUILD <<EOF
786+
load("@rules_python//python:py_binary.bzl", "py_binary")
743787
package(default_visibility=["//visibility:public"])
744788
py_binary(name="bin", srcs=["bin.py"], deps=["//lib:lib"])
745789
EOF
@@ -754,6 +798,7 @@ EOF
754798

755799
mkdir -p $r/lib
756800
cat > $r/lib/BUILD <<EOF
801+
load("@rules_python//python:py_library.bzl", "py_library")
757802
package(default_visibility=["//visibility:public"])
758803
py_library(name="lib", srcs=["lib.py"])
759804
EOF
@@ -849,12 +894,15 @@ EOF
849894
}
850895

851896
function test_slash_in_repo_name() {
897+
add_rules_cc "MODULE.bazel"
852898
local r=$TEST_TMPDIR/r
853899
rm -fr $r
854900
mkdir -p $r/a
855901

856902
touch $r/a/REPO.bazel
857903
cat > $r/a/BUILD <<EOF
904+
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
905+
858906
cc_binary(
859907
name = "bin",
860908
srcs = ["bin.cc"],
@@ -881,8 +929,11 @@ function test_remote_includes() {
881929
rm -fr $remote
882930
mkdir -p $remote/inc
883931

932+
add_rules_cc "MODULE.bazel"
884933
touch $remote/REPO.bazel
885934
cat > $remote/BUILD <<EOF
935+
load("@rules_cc//cc:cc_library.bzl", "cc_library")
936+
886937
cc_library(
887938
name = "bar",
888939
srcs = ["bar.cc"],
@@ -908,6 +959,8 @@ local_repository(
908959
)
909960
EOF
910961
cat > BUILD <<EOF
962+
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
963+
911964
cc_binary(
912965
name = "foo",
913966
srcs = ["foo.cc"],
@@ -944,15 +997,20 @@ new_local_repository(
944997
build_file="//:BUILD.r"
945998
)
946999
EOF
1000+
add_rules_cc "MODULE.bazel"
9471001

9481002
touch BUILD
9491003
cat > BUILD.r <<EOF
1004+
load("@rules_cc//cc:cc_library.bzl", "cc_library")
1005+
9501006
cc_library(name = "a", srcs = ["a.cc"])
9511007
EOF
9521008

9531009
bazel build @r//:a || fail "build failed"
9541010

9551011
cat > BUILD.r <<EOF
1012+
load("@rules_cc//cc:cc_library.bzl", "cc_library")
1013+
9561014
cc_library(name = "a", srcs = ["a.cc", "b.cc"])
9571015
EOF
9581016

@@ -1166,6 +1224,7 @@ EOF
11661224
# Creates an indirect dependency on X from A and make sure the error message
11671225
# refers to the correct label, both in an external repository and not.
11681226
function test_indirect_dep_message() {
1227+
add_rules_java "MODULE.bazel"
11691228
local external_dir=$TEST_TMPDIR/ext-dir
11701229
mkdir -p a b $external_dir/x
11711230
cat > a/A.java <<EOF
@@ -1180,6 +1239,8 @@ public class A {
11801239
}
11811240
EOF
11821241
cat > a/BUILD <<EOF
1242+
load("@rules_java//java:java_library.bzl", "java_library")
1243+
11831244
java_binary(
11841245
name = "a",
11851246
main_class = "a.A",
@@ -1199,6 +1260,8 @@ public class B {
11991260
}
12001261
EOF
12011262
cat > b/BUILD <<EOF
1263+
load("@rules_java//java:java_library.bzl", "java_library")
1264+
12021265
java_library(
12031266
name = "b",
12041267
srcs = ["B.java"],
@@ -1220,6 +1283,8 @@ public class X {
12201283
}
12211284
EOF
12221285
cat > $external_dir/x/BUILD <<EOF
1286+
load("@rules_java//java:java_library.bzl", "java_library")
1287+
12231288
java_library(
12241289
name = "x",
12251290
srcs = ["X.java"],
@@ -1284,7 +1349,10 @@ EOF
12841349
local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
12851350
local_repository(name = 'blue', path = "${repo2}")
12861351
EOF
1352+
add_rules_shell "MODULE.bazel"
12871353
cat > green/BUILD <<EOF
1354+
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
1355+
12881356
sh_binary(
12891357
name = "run-the-thing",
12901358
srcs = ["@blue//blue:do-the-thing"],
@@ -1304,6 +1372,8 @@ function test_public_includes_main_repo_from_external_dep() {
13041372
repo2=${new_workspace_dir}
13051373
mkdir -p blue
13061374
cat > blue/BUILD <<EOF
1375+
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
1376+
13071377
sh_binary(
13081378
name = "run-the-thing",
13091379
srcs = ["@//green:do-the-thing"],
@@ -1316,6 +1386,7 @@ EOF
13161386
local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
13171387
local_repository(name = 'blue', path = "${repo2}")
13181388
EOF
1389+
add_rules_shell "MODULE.bazel"
13191390
cat > green/BUILD <<EOF
13201391
package_group(
13211392
name = "everyone",

0 commit comments

Comments
 (0)
0