From 6e26af4f027f6d6d3c8045f3b2c57b2255e911e3 Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Thu, 27 Aug 2015 20:25:31 -0400 Subject: tests: fix miniseq and "make distcheck" This is a bit of a hack, but it works; fix it later. Signed-off-by: Paul Moore --- tests/regression | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/regression b/tests/regression index 2aba23b..6bf6ea3 100755 --- a/tests/regression +++ b/tests/regression @@ -183,7 +183,17 @@ function get_range() { # 2 last value # function get_seq() { - ${basedir}/miniseq "$1" "$2" + # NOTE: this whole thing is a bit hacky, but we need to search around + # for miniseq to fix 'make distcheck', someday we should fix this + if [[ -x ./miniseq ]]; then + ./miniseq "$1" "$2" + elif [[ -x $basedir/miniseq ]]; then + $basedir/miniseq "$1" "$2" + else + # we're often run from a subshell, so we can't simply exit + echo "error: unable to find miniseq" >&2 + kill $pid + fi } # @@ -875,6 +885,9 @@ stats_error=0 # set the test root directory basedir=$(dirname $0) +# set the test harness pid +pid=$$ + # parse the command line while getopts "ab:gl:m:s:t:T:vh" opt; do case $opt in -- cgit v1.2.1