diff options
| author | teor <teor@torproject.org> | 2019-10-31 00:58:09 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-05 11:07:31 +1000 |
| commit | 5b04db59f69332ac6d44e12ad759e224a9cd3b99 (patch) | |
| tree | 5813b8ac650a779b1ab955d2170a394f73d2d45e /src/test/test_cmdline.sh | |
| parent | f29de4b8d2097676f9d2f067c176b38a08362046 (diff) | |
| download | tor-5b04db59f69332ac6d44e12ad759e224a9cd3b99.tar.gz tor-5b04db59f69332ac6d44e12ad759e224a9cd3b99.zip | |
test/scripts: Use the same code to find the tor binary
This change makes sure we are always using the coverage binary, when
coverage is enabled.
Fixes bug 32368; bugfix on 0.2.7.3-rc.
Diffstat (limited to 'src/test/test_cmdline.sh')
| -rwxr-xr-x | src/test/test_cmdline.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/test/test_cmdline.sh b/src/test/test_cmdline.sh index cf758c3851..ded58af63d 100755 --- a/src/test/test_cmdline.sh +++ b/src/test/test_cmdline.sh @@ -3,6 +3,21 @@ umask 077 set -e +# emulate realpath(), in case coreutils or equivalent is not installed. +abspath() { + f="$*" + if [ -d "$f" ]; then + dir="$f" + base="" + else + dir="$(dirname "$f")" + base="/$(basename "$f")" + fi + dir="$(cd "$dir" && pwd)" + echo "$dir$base" +} + +# find the tor binary if [ $# -ge 1 ]; then TOR_BINARY="${1}" shift @@ -10,6 +25,8 @@ else TOR_BINARY="${TESTING_TOR_BINARY:-./src/app/tor}" fi +TOR_BINARY="$(abspath "$TOR_BINARY")" + echo "TOR BINARY IS ${TOR_BINARY}" die() { echo "$1" >&2 ; exit 5; } |