Skip to content

Commit 32fc278

Browse files
committed
WIP: Bzlmod part the one hundred thirty-fifth
Update tests for Bazel 6 + Bzlmod Copied the regular expression used to optionally match canonical repo name prefixes in `buildozer` commands from bazel-contrib#1622. These never failed when building with Bzlmod and Bazel 7.4.1, but did under Bazel 6.5.0.
1 parent e89e12d commit 32fc278

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

test/shell/test_scala_library.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ test_scala_library_expect_failure_on_missing_direct_internal_deps() {
5959
}
6060

6161
test_scala_library_expect_failure_on_missing_direct_external_deps_jar() {
62-
dependenecy_target='@com_google_guava_guava_21_0//:com_google_guava_guava_21_0'
62+
dependenecy_target='@[a-z_.~+-]*com_google_guava_guava_21_0//:com_google_guava_guava_21_0'
6363
test_target='test_expect_failure/missing_direct_deps/external_deps:transitive_external_dependency_user'
6464

6565
test_scala_library_expect_failure_on_missing_direct_deps $dependenecy_target $test_target
6666
}
6767

6868
test_scala_library_expect_failure_on_missing_direct_external_deps_file_group() {
69-
dependenecy_target='@com_google_guava_guava_21_0_with_file//:com_google_guava_guava_21_0_with_file'
69+
dependenecy_target='@[a-z_.~+-]*com_google_guava_guava_21_0_with_file//:com_google_guava_guava_21_0_with_file'
7070
test_target='test_expect_failure/missing_direct_deps/external_deps:transitive_external_dependency_user_file_group'
7171

7272
test_scala_library_expect_failure_on_missing_direct_deps $dependenecy_target $test_target

test/shell/test_strict_dependency.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ test_strict_deps_filter_excluded_target() {
6060

6161
test_strict_deps_filter_included_target() {
6262
local test_target="//test_expect_failure/missing_direct_deps/filtering:b"
63-
local expected_message="buildozer 'add deps @com_google_guava_guava_21_0//:com_google_guava_guava_21_0' ${test_target}"
63+
local expected_message="buildozer 'add deps @[a-z_.~+-]*com_google_guava_guava_21_0//:com_google_guava_guava_21_0' ${test_target}"
6464

6565
test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message \
6666
"${expected_message}" ${test_target} \

test/shell/test_unused_dependency.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ test_unused_deps_filter_excluded_target() {
7979

8080
test_unused_deps_filter_included_target() {
8181
local test_target="//test_expect_failure/unused_dependency_checker/filtering:b"
82-
local expected_message="buildozer 'remove deps @com_google_guava_guava_21_0//:com_google_guava_guava_21_0' ${test_target}"
82+
local expected_message="buildozer 'remove deps @[a-z_.~+-]*com_google_guava_guava_21_0//:com_google_guava_guava_21_0' ${test_target}"
8383

8484
test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message \
8585
"${expected_message}" ${test_target} \

0 commit comments

Comments
 (0)