From 4a65030a68f950582988f9ef227a8d937b9924b6 Mon Sep 17 00:00:00 2001
From: Stan Rosenberg <stan.rosenberg@gmail.com>
Date: Tue, 19 Sep 2023 15:14:50 -0400
Subject: [PATCH] sql: add libgeos runfile dependency for RSG tests

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] https://github.com/cockroachdb/cockroach/pull/110129

Epic: none
Fixes: #110780

Release note: None
---
 .../teamcity/cockroach/nightlies/random_syntax_tests_impl.sh  | 1 -
 pkg/sql/tests/BUILD.bazel                                     | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/teamcity/cockroach/nightlies/random_syntax_tests_impl.sh b/build/teamcity/cockroach/nightlies/random_syntax_tests_impl.sh
index 48523b757e55..60d2e5ed197f 100755
--- a/build/teamcity/cockroach/nightlies/random_syntax_tests_impl.sh
+++ b/build/teamcity/cockroach/nightlies/random_syntax_tests_impl.sh
@@ -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
diff --git a/pkg/sql/tests/BUILD.bazel b/pkg/sql/tests/BUILD.bazel
index 846617b1b2b8..818d08501531 100644
--- a/pkg/sql/tests/BUILD.bazel
+++ b/pkg/sql/tests/BUILD.bazel
@@ -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,