Skip to content

Commit 99a0115

Browse files
meteorcloudycopybara-github
authored andcommitted
Fix //src/test/shell/bazel:srcs_test
This test has been failing since we switched to Bzlmod, therefore the top level `//:srcs` target doesn't contain all Bazel source files anymore. This PR fixes the tests and all relevant BUILD file to restore the correct state. Closes #26141. PiperOrigin-RevId: 765106541 Change-Id: Ib8f0ac643e0f613fe9e2e6a9e330c224829c23c7
1 parent 9b90f40 commit 99a0115

File tree

29 files changed

+127
-24
lines changed

29 files changed

+127
-24
lines changed

BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ filegroup(
3030
srcs = glob(
3131
["*"],
3232
exclude = [
33-
"MODULE.bazel.lock", # Use MODULE.bazel.lock.dist instead
3433
"bazel-*", # convenience symlinks
3534
"out", # IntelliJ with setup-intellij.sh
3635
"output", # output of compile.sh
@@ -164,6 +163,7 @@ pkg_files(
164163
srcs = ["//:srcs"],
165164
attributes = pkg_attributes(mode = "0755"),
166165
excludes = [
166+
"MODULE.bazel.lock", # Use MODULE.bazel.lock.dist instead
167167
"//examples:srcs",
168168
"//site:srcs",
169169
"//src:srcs-to-exclude-in-distfile",

src/BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@ filegroup(
388388
"//src/main/protobuf:srcs",
389389
"//src/main/res:srcs",
390390
"//src/main/starlark/builtins_bzl:srcs",
391+
"//src/main/starlark/docgen:srcs",
391392
"//src/main/tools:srcs",
392393
"//src/test/cpp:srcs",
393394
"//src/test/gen:srcs",
@@ -406,6 +407,7 @@ filegroup(
406407
"//src/test/tools:srcs",
407408
"//src/test/tools/bzlmod:srcs",
408409
"//src/test/tools/test_repos:srcs",
410+
"//src/tools/android:srcs",
409411
"//src/tools/bzlmod:srcs",
410412
"//src/tools/diskcache:srcs",
411413
"//src/tools/execlog:srcs",

src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/BUILD

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ package(
1010

1111
licenses(["notice"])
1212

13+
filegroup(
14+
name = "srcs",
15+
srcs = glob(["**"]),
16+
visibility = ["//src:__subpackages__"],
17+
)
18+
1319
_TURBINE_MAIN_CLASS = "com.google.turbine.main.Main"
1420

1521
java_library(
@@ -155,13 +161,3 @@ sh_binary(
155161
name = "update_turbine_pgo",
156162
srcs = ["update_turbine_pgo.sh"],
157163
)
158-
159-
filegroup(
160-
name = "srcs",
161-
srcs = glob(
162-
["**/*.java"],
163-
allow_empty = True,
164-
) + [
165-
"BUILD",
166-
],
167-
)

src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata/BUILD

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ licenses(["notice"]) # Apache 2.0
1212
filegroup(
1313
name = "srcs",
1414
testonly = False,
15-
srcs = glob(["**"]),
15+
srcs = glob(["**"]) + [
16+
"//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata/j_p_l:srcs",
17+
],
1618
)
1719

1820
java_library(

src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata/j_p_l/BUILD

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ package(
88
default_visibility = ["//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps:__subpackages__"],
99
)
1010

11+
filegroup(
12+
name = "srcs",
13+
testonly = False,
14+
srcs = glob(["**"]),
15+
visibility = ["//src:__subpackages__"],
16+
)
17+
1118
java_library(
1219
name = "a",
1320
srcs = ["A.java"],

src/main/protobuf/BUILD

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,9 @@ java_library_srcs(
418418

419419
filegroup(
420420
name = "srcs",
421-
srcs = glob(["**"]),
421+
srcs = glob(["**"]) + [
422+
"//src/main/protobuf/project:srcs",
423+
],
422424
)
423425

424426
filegroup(

src/main/protobuf/project/BUILD

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ package(
66
default_visibility = ["//visibility:private"],
77
)
88

9+
filegroup(
10+
name = "srcs",
11+
srcs = glob(["**"]),
12+
visibility = ["//src:__subpackages__"],
13+
)
14+
915
filegroup(
1016
name = "project_proto_scl",
1117
srcs = ["project_proto.scl"],

src/main/starlark/docgen/BUILD

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ package(
33
default_visibility = ["//src:__subpackages__"],
44
)
55

6+
filegroup(
7+
name = "srcs",
8+
srcs = glob(["**"]),
9+
visibility = ["//src:__subpackages__"],
10+
)
11+
612
# This rule is only available from Bazel 7.0.0
713
starlark_doc_extract(
814
name = "gen_be_proto_stardoc_proto",

src/test/java/com/google/devtools/build/lib/BUILD

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ filegroup(
3131
"//src/test/java/com/google/devtools/build/lib/generatedprojecttest:srcs",
3232
"//src/test/java/com/google/devtools/build/lib/generatedprojecttest/util:srcs",
3333
"//src/test/java/com/google/devtools/build/lib/graph:srcs",
34+
"//src/test/java/com/google/devtools/build/lib/includescanning:srcs",
3435
"//src/test/java/com/google/devtools/build/lib/integration/util:srcs",
3536
"//src/test/java/com/google/devtools/build/lib/io:srcs",
3637
"//src/test/java/com/google/devtools/build/lib/metrics:srcs",
@@ -46,14 +47,17 @@ filegroup(
4647
"//src/test/java/com/google/devtools/build/lib/query2:srcs",
4748
"//src/test/java/com/google/devtools/build/lib/remote:srcs",
4849
"//src/test/java/com/google/devtools/build/lib/rules:srcs",
50+
"//src/test/java/com/google/devtools/build/lib/runtime:srcs",
4951
"//src/test/java/com/google/devtools/build/lib/sandbox:srcs",
5052
"//src/test/java/com/google/devtools/build/lib/server:srcs",
5153
"//src/test/java/com/google/devtools/build/lib/skyframe:srcs",
5254
"//src/test/java/com/google/devtools/build/lib/skyframe/packages:srcs",
5355
"//src/test/java/com/google/devtools/build/lib/skyframe/serialization:srcs",
5456
"//src/test/java/com/google/devtools/build/lib/standalone:srcs",
5557
"//src/test/java/com/google/devtools/build/lib/starlark:srcs",
58+
"//src/test/java/com/google/devtools/build/lib/starlarkbuildapi/core:srcs",
5659
"//src/test/java/com/google/devtools/build/lib/starlarkdebug/server:srcs",
60+
"//src/test/java/com/google/devtools/build/lib/starlarkdocextract:srcs",
5761
"//src/test/java/com/google/devtools/build/lib/supplier:srcs",
5862
"//src/test/java/com/google/devtools/build/lib/testing/common:srcs",
5963
"//src/test/java/com/google/devtools/build/lib/testutil:srcs",

src/test/java/com/google/devtools/build/lib/includescanning/BUILD

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ package(
55
default_visibility = ["//src:__subpackages__"],
66
)
77

8+
filegroup(
9+
name = "srcs",
10+
srcs = glob(["**"]),
11+
visibility = ["//src:__subpackages__"],
12+
)
13+
814
java_test(
915
name = "CppIncludeScanningContextImplTest",
1016
size = "small",

src/test/java/com/google/devtools/build/lib/rules/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ filegroup(
1010
name = "srcs",
1111
testonly = 0,
1212
srcs = glob(["*"]) + [
13+
"//src/test/java/com/google/devtools/build/lib/rules/android:srcs",
1314
"//src/test/java/com/google/devtools/build/lib/rules/apple:srcs",
1415
"//src/test/java/com/google/devtools/build/lib/rules/config:srcs",
1516
"//src/test/java/com/google/devtools/build/lib/rules/cpp:srcs",

src/test/java/com/google/devtools/build/lib/runtime/BUILD

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ package(
66
default_visibility = ["//src:__subpackages__"],
77
)
88

9+
filegroup(
10+
name = "srcs",
11+
testonly = 0,
12+
srcs = glob(["**"]) + [
13+
"//src/test/java/com/google/devtools/build/lib/runtime/commands/info:srcs",
14+
],
15+
visibility = ["//src:__subpackages__"],
16+
)
17+
918
java_library(
1019
name = "RuntimeTests_lib",
1120
srcs = glob(

src/test/java/com/google/devtools/build/lib/runtime/commands/info/BUILD

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ package(
66
default_visibility = ["//src:__subpackages__"],
77
)
88

9+
filegroup(
10+
name = "srcs",
11+
testonly = 0,
12+
srcs = glob(["**"]),
13+
visibility = ["//src:__subpackages__"],
14+
)
15+
916
java_test(
1017
name = "StdoutInfoItemHandlerTest",
1118
size = "small",

src/test/java/com/google/devtools/build/lib/skyframe/serialization/BUILD

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ package(
88
filegroup(
99
name = "srcs",
1010
testonly = 0,
11-
srcs = glob(["**"]),
11+
srcs = glob(["**"]) + [
12+
"//src/test/java/com/google/devtools/build/lib/skyframe/serialization/analysis:srcs",
13+
"//src/test/java/com/google/devtools/build/lib/skyframe/serialization/strings:srcs",
14+
"//src/test/java/com/google/devtools/build/lib/skyframe/serialization/testutils:srcs",
15+
],
1216
visibility = ["//src:__subpackages__"],
1317
)
1418

src/test/java/com/google/devtools/build/lib/skyframe/serialization/analysis/BUILD

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ package(
55
default_visibility = ["//src:__subpackages__"],
66
)
77

8+
filegroup(
9+
name = "srcs",
10+
srcs = glob(["**"]),
11+
visibility = ["//src:__subpackages__"],
12+
)
13+
814
java_test(
915
name = "AnalysisCacheInvalidatorTest",
1016
srcs = ["AnalysisCacheInvalidatorTest.java"],

src/test/java/com/google/devtools/build/lib/starlarkbuildapi/core/BUILD

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ package(
66
default_visibility = ["//src:__subpackages__"],
77
)
88

9+
filegroup(
10+
name = "srcs",
11+
testonly = 0,
12+
srcs = glob(["**"]),
13+
visibility = ["//src:__subpackages__"],
14+
)
15+
916
java_test(
1017
name = "ContextGuardedValueTest",
1118
srcs = ["ContextGuardedValueTest.java"],

src/test/java/com/google/devtools/build/lib/util/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ filegroup(
1111
testonly = 0,
1212
srcs = glob(["*"]) + [
1313
"//src/test/java/com/google/devtools/build/lib/util/io:srcs",
14+
"//src/test/java/com/google/devtools/build/lib/util/regex:srcs",
1415
"//src/test/java/com/google/devtools/build/lib/util/subjects:srcs",
1516
],
1617
visibility = ["//src:__subpackages__"],

src/test/java/com/google/devtools/build/lib/util/regex/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ filegroup(
1313
name = "srcs",
1414
testonly = 0,
1515
srcs = glob(["**"]),
16-
visibility = ["//visibility:private"],
16+
visibility = ["//src:__subpackages__"],
1717
)
1818

1919
java_test(

src/test/shell/bazel/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,6 +1240,7 @@ sh_test(
12401240
srcs = ["srcs_test.sh"],
12411241
data = [
12421242
":srcs_list",
1243+
"@bazel_tools//tools/bash/runfiles",
12431244
"@local_bazel_source_list//:sources",
12441245
],
12451246
tags = ["no_windows"],

src/test/shell/bazel/srcs_test.sh

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,40 @@
1818
# Actually this test just compares the two input (the file list and the
1919
# //:srcs filegroup and show the diff)
2020

21-
LIST_SRCS="${TEST_SRCDIR}/local_bazel_source_list/sources.txt"
21+
# --- begin runfiles.bash initialization ---
22+
# Copy-pasted from Bazel's Bash runfiles library (tools/bash/runfiles/runfiles.bash).
23+
set -euo pipefail
24+
if [[ ! -d "${RUNFILES_DIR:-/dev/null}" && ! -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then
25+
if [[ -f "$0.runfiles_manifest" ]]; then
26+
export RUNFILES_MANIFEST_FILE="$0.runfiles_manifest"
27+
elif [[ -f "$0.runfiles/MANIFEST" ]]; then
28+
export RUNFILES_MANIFEST_FILE="$0.runfiles/MANIFEST"
29+
elif [[ -f "$0.runfiles/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then
30+
export RUNFILES_DIR="$0.runfiles"
31+
fi
32+
fi
33+
if [[ -f "${RUNFILES_DIR:-/dev/null}/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then
34+
source "${RUNFILES_DIR}/bazel_tools/tools/bash/runfiles/runfiles.bash"
35+
elif [[ -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then
36+
source "$(grep -m1 "^bazel_tools/tools/bash/runfiles/runfiles.bash " \
37+
"$RUNFILES_MANIFEST_FILE" | cut -d ' ' -f 2-)"
38+
else
39+
echo >&2 "ERROR: cannot find @bazel_tools//tools/bash/runfiles:runfiles.bash"
40+
exit 1
41+
fi
42+
# --- end runfiles.bash initialization ---
43+
44+
LIST_SRCS="$(rlocation "local_bazel_source_list/sources.txt")"
2245
SRCS_QUERY="$(mktemp)"
2346

24-
# Rewrite labels to file paths. This assumes any external repo is actually
25-
# a local_repository located in third_party.
26-
cat "${TEST_SRCDIR}/io_bazel/src/test/shell/bazel/srcs_list" \
27-
| sed -e 's|@bazel_tools//||' \
28-
| sed -e 's|@io_bazel//||' \
29-
| sed -e 's|@\([^/]*\)//|third_party/\1|' \
47+
# Rewrite labels to file paths, ignoring all external repos.
48+
cat "$(rlocation "io_bazel/src/test/shell/bazel/srcs_list")" \
49+
| sed -e '/^@@/d' \
3050
| sed -e 's|^//||' | sed -e 's|^:||' | sed -e 's|:|/|' \
3151
| sort -u >"${SRCS_QUERY}"
3252

3353
res="$(diff -U 0 "${LIST_SRCS}" "${SRCS_QUERY}" | sed -e 's|^-||' \
34-
| grep -Ev '^(@@|\+\+|--)' || true)"
54+
| grep -Ev '^(@|\+|-)' || true)"
3555

3656
if [ -n "${res}" ]; then
3757
echo "//:srcs filegroup do not contains all the sources, missing:

src/tools/android/BUILD

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ filegroup(
33
srcs = [
44
"BUILD",
55
"maven_android_install.json",
6+
"//src/tools/android/java/com/google/devtools/build/android:BUILD",
7+
"//src/tools/android/java/com/google/devtools/build/android/dexer:BUILD",
8+
"//src/tools/android/java/com/google/devtools/build/android/idlclass:BUILD",
9+
"//src/tools/android/java/com/google/devtools/build/android/resources:BUILD",
10+
"//src/tools/android/java/com/google/devtools/build/android/ziputils:BUILD",
611
],
712
visibility = ["//src:__pkg__"],
813
)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
# Empty migration placeholder
2+
exports_files(["BUILD"])
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
# Empty migration placeholder
2+
exports_files(["BUILD"])
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
# Empty migration placeholder
2+
exports_files(["BUILD"])

src/tools/android/java/com/google/devtools/build/android/r8/BUILD

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
# Empty migration placeholder
2+
exports_files(["BUILD"])
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
# Empty migration placeholder
2+
exports_files(["BUILD"])

third_party/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ filegroup(
2020
"//third_party/java/jcommander:srcs",
2121
"//third_party/java/proguard:srcs",
2222
"//third_party/pprof:srcs",
23+
"//third_party/proguard:srcs",
2324
"//third_party/protobuf:srcs",
2425
"//third_party/py/abseil:srcs",
2526
"//third_party/py/concurrent:srcs",

third_party/proguard/BUILD

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
load("@rules_java//java:java_binary.bzl", "java_binary")
22
load("@rules_java//java:java_import.bzl", "java_import")
33

4+
filegroup(
5+
name = "srcs",
6+
srcs = glob(["**"]),
7+
visibility = ["//third_party:__subpackages__"],
8+
)
9+
410
java_binary(
511
name = "proguard",
612
main_class = "proguard.ProGuard",

0 commit comments

Comments
 (0)