Skip to content

Commit 65ede19

Browse files
committed
testing: fix test exeuction paths with move to docker container
Signed-off-by: Paul Osborne <[email protected]>
1 parent f44983d commit 65ede19

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

ci/run.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set -e
77

88
BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
99
MANIFEST_PATH="${BASE_DIR}/Cargo.toml"
10+
BUILD_DIR="."
1011

1112
VERSION="$1"
1213
TARGET="$2"
@@ -43,12 +44,12 @@ cross_compile_tests() {
4344
# ask cargo what test files it generated:
4445
# https://github.com/rust-lang/cargo/issues/1924
4546
find_binaries() {
46-
target_base_dir="target/${TARGET}/debug"
47+
target_base_dir="${BUILD_DIR}/${TARGET}/debug"
4748

4849
# find [[test]] sections and print the first line and
4950
# hack it to what we want from there. Also "nix" for
5051
# tests that are implicitly prsent
51-
for test_base in $( awk '/\[\[test\]\]/{getline; print}' Cargo.toml | \
52+
for test_base in $( awk '/\[\[test\]\]/{getline; print}' "${MANIFEST_PATH}" | \
5253
cut -d '=' -f2 | \
5354
tr -d '"' | \
5455
tr '-' '_' | \

0 commit comments

Comments
 (0)