sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Integreate test_keygen.sh into 'make check'.

This commit is contained in:
Nick Mathewson 2015-08-06 11:27:25 -04:00
parent 8f6f1544c9
commit 4ce0b7e916
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -25,6 +25,8 @@ include src/include.am
include doc/include.am
include contrib/include.am
export TESTING_TOR_BINARY
EXTRA_DIST+= \
ChangeLog \
INSTALL \

2
src/test/include.am
View File

@ -1,5 +1,5 @@
TESTSCRIPTS = src/test/test_zero_length_keys.sh
TESTSCRIPTS = src/test/test_zero_length_keys.sh src/test/test_keygen.sh
if USEPYTHON
TESTSCRIPTS += src/test/test_ntor.sh src/test/test_bt.sh

17
src/test/test_keygen.sh
View File

@ -7,11 +7,20 @@ umask 077
set -e
if [ $# -eq 0 ] || [ ! -f ${1} ] || [ ! -x ${1} ]; then
echo "Usage: ${0} PATH_TO_TOR [case-number]"
exit 1
elif [ $# -ge 1 ]; then
if [ "$TESTING_TOR_BINARY" = ""] ; then
echo "Usage: ${0} PATH_TO_TOR [case-number]"
exit 1
fi
fi
if [ $# -ge 1 ]; then
TOR_BINARY="${1}"
shift
else
TOR_BINARY="${TESTING_TOR_BINARY}"
fi
if [ $# -ge 1 ]; then
dflt=0
@ -35,7 +44,7 @@ elif [ $# -ge 1 ]; then
if [ $# -ge 1 ]; then
eval "CASE${1}"=1
fi
fi
die() { echo "$1" >&2 ; exit 5; }
check_dir() { [ -d "$1" ] || die "$1 did not exist"; }