Skip to content

Commit

Permalink
sql: add libgeos runfile dependency for RSG tests
Browse files Browse the repository at this point in the history
In [1], we updated CI (nightly) to require a build
step for `//c-deps:libgeos`. That didn't fix `rsg_test`'s
implicit dependency on libgeos, since the produced artifacts
are not reachable from the test sandbox.

Instead, we use a runfile dependency--same way other
test packages specify libgeos dependency. This enables
dynamic loading via `bazel.Runfile`.

[1] cockroachdb#110129

Epic: none
Fixes: cockroachdb#110780

Release note: None
  • Loading branch information
srosenberg committed Sep 19, 2023
1 parent 33623e3 commit 4a65030
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ set -xeuo pipefail

dir="$(dirname $(dirname $(dirname $(dirname "${0}"))))"

bazel build --config ci --config force_build_cdeps //c-deps:libgeos
bazel build //pkg/cmd/bazci --config=ci
BAZEL_BIN=$(bazel info bazel-bin --config=ci)
exit_status=0
Expand Down
4 changes: 3 additions & 1 deletion pkg/sql/tests/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ go_test(
"//build/toolchains:use_ci_timeouts": ["-test.timeout=895s"],
"//conditions:default": ["-test.timeout=3595s"],
}),
data = glob(["testdata/**"]),
data = glob(["testdata/**"]) + [
"//c-deps:libgeos", # keep
],
embed = [":tests"],
exec_properties = {"Pool": "large"},
shard_count = 16,
Expand Down

0 comments on commit 4a65030

Please sign in to comment.