summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-02-22 22:04:22 +0100
committerMichael Vogt <mvo@debian.org>2014-02-22 22:04:22 +0100
commit3e5f181e51bc94fa45e9a36fb094cd3051212013 (patch)
tree7538d48c960235b229d2830fec033d73ffc8930f
parentadff049d96e27242b5784455399238df8680dceb (diff)
fix ADT failure in downloadfile()
-rw-r--r--test/integration/framework6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/integration/framework b/test/integration/framework
index be2cb95d1..99214ef73 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -935,6 +935,10 @@ changetocdrom() {
downloadfile() {
PROTO="$(echo "$1" | cut -d':' -f 1)"
+ if [ ! -x "${METHODSDIR}/${PROTO}" ]; then
+ msgwarn "can not find ${METHODSDIR}/${PROTO}"
+ return 1
+ fi
local DOWNLOG="${TMPWORKINGDIRECTORY}/download.log"
rm -f "$DOWNLOG"
touch "$DOWNLOG"
@@ -963,7 +967,7 @@ Filename: ${2}
break
fi
done
- } | LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/methods/${PROTO} 2>&1 | tee "$DOWNLOG"
+ } | LD_LIBRARY_PATH=${BUILDDIRECTORY} ${METHODSDIR}/${PROTO} 2>&1 | tee "$DOWNLOG"
rm "$DOWNLOG"
# only if the file exists the download was successful
if [ -e "$2" ]; then