summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lacasse <nlacasse@google.com>2019-01-09 17:36:38 -0800
committerShentubot <shentubot@google.com>2019-01-09 17:37:52 -0800
commit6e91a98f6ba02857e381c0f199c1494c6f1d7839 (patch)
treee0cfd0c55bab66e89cbf7e3333001f1bff449c8f
parent0676843875b783e8157fc062b2bb322948b4f29a (diff)
Avoid $(location) in syscall tests.
Instead just find the syscall_test_runner binary in the shell script. PiperOrigin-RevId: 228621230 Change-Id: I274ee0874e47d53f59474b1ac730ee45e3dff977
-rw-r--r--test/syscalls/build_defs.bzl4
-rwxr-xr-xtest/syscalls/syscall_test_runner.sh8
2 files changed, 6 insertions, 6 deletions
diff --git a/test/syscalls/build_defs.bzl b/test/syscalls/build_defs.bzl
index f0c914095..d6c2a1290 100644
--- a/test/syscalls/build_defs.bzl
+++ b/test/syscalls/build_defs.bzl
@@ -34,9 +34,7 @@ def _syscall_test(test, shard_count, size, platform):
test,
],
args = [
- # First argument is location to syscall_test_runner go binary.
- "$(location :syscall_test_runner)",
- # Rest of arguments are passed directly to syscall_test_runner binary.
+ # Arguments are passed directly to syscall_test_runner binary.
"--test-name=" + test_name,
"--platform=" + platform,
"--debug=false",
diff --git a/test/syscalls/syscall_test_runner.sh b/test/syscalls/syscall_test_runner.sh
index de479f68c..4f3790137 100755
--- a/test/syscalls/syscall_test_runner.sh
+++ b/test/syscalls/syscall_test_runner.sh
@@ -20,6 +20,8 @@
set -euf -o pipefail
-# The syscall test runner binary and arguments have all been passed as arguments
-# to this shell script.
-exec "$@"
+# Get location of syscall_test_runner binary.
+readonly runner=$(find ${TEST_SRCDIR} -name syscall_test_runner)
+
+# Pass the arguments of this script directly to the runner.
+exec "${runner}" "$@"