Commit 5b04db59 authored by teor's avatar teor
Browse files

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.
parent f29de4b8

changes/bug32368

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (test):

    - Use the same code to find the tor binary in all of our test scripts.

      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.

src/test/test_cmdline.sh

+17 −0
Original line number Diff line number Diff line
@@ -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; }

src/test/test_key_expiration.sh

+20 −1
Original line number Diff line number Diff line
@@ -6,6 +6,20 @@ 
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"

}



if [ $# -eq 0 ] || [ ! -f "${1}" ] || [ ! -x "${1}" ]; then

  if [ "$TESTING_TOR_BINARY" = "" ] ; then

    echo "Usage: ${0} PATH_TO_TOR [case-number]"
@@ -21,13 +35,18 @@ if test "$UNAME_OS" = 'CYGWIN' || \ 
  exit 77

fi



# find the tor binary

if [ $# -ge 1 ]; then

  TOR_BINARY="${1}"

  shift

else

  TOR_BINARY="${TESTING_TOR_BINARY}"

  TOR_BINARY="${TESTING_TOR_BINARY:-./src/app/tor}"

fi



TOR_BINARY="$(abspath "$TOR_BINARY")"



echo "TOR BINARY IS ${TOR_BINARY}"



if "$TOR_BINARY" --list-modules | grep -q "relay: no"; then

  echo "This test requires the relay module. Skipping." >&2

  exit 77

src/test/test_keygen.sh

+20 −1
Original line number Diff line number Diff line
@@ -6,6 +6,20 @@ 
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"

}



if [ $# -eq 0 ] || [ ! -f "${1}" ] || [ ! -x "${1}" ]; then

  if [ "$TESTING_TOR_BINARY" = "" ] ; then

    echo "Usage: ${0} PATH_TO_TOR [case-number]"
@@ -21,13 +35,18 @@ if test "$UNAME_OS" = 'CYGWIN' || \ 
  exit 77

fi



# find the tor binary

if [ $# -ge 1 ]; then

  TOR_BINARY="${1}"

  shift

else

  TOR_BINARY="${TESTING_TOR_BINARY}"

  TOR_BINARY="${TESTING_TOR_BINARY:-./src/app/tor}"

fi



TOR_BINARY="$(abspath "$TOR_BINARY")"



echo "TOR BINARY IS ${TOR_BINARY}"



if "$TOR_BINARY" --list-modules | grep -q "relay: no"; then

  echo "This test requires the relay module. Skipping." >&2

  exit 77

src/test/test_parseconf.sh

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ fi 


TOR_BINARY="$(abspath "$TOR_BINARY")"



echo "TOR BINARY IS ${TOR_BINARY}"



TOR_MODULES_DISABLED="$("$TOR_BINARY" --list-modules | grep ": no" \

                        | cut -d ":" -f1 | sort | tr "\n" "_")"

# Remove the last underscore, if there is one