Define certdir in a VPATH-compatible way
authorWouter Verhelst <w@uter.be>
Mon, 19 Dec 2016 22:09:00 +0000 (23:09 +0100)
committerWouter Verhelst <w@uter.be>
Mon, 19 Dec 2016 22:09:27 +0000 (23:09 +0100)
Signed-off-by: Wouter Verhelst <w@uter.be>
tests/run/simple_test

index 2fdb62b..9f378d3 100755 (executable)
@@ -10,6 +10,7 @@ conffile=${tmpdir}/nbd.conf
 pidfile=${tmpdir}/nbd.pid
 tmpnam=${tmpdir}/nbd.dd
 mydir=$(dirname $0)
+certdir=${mydir}/certs
 cleanup="$2"
 PID=""
 
@@ -308,7 +309,6 @@ EOF
        ;;
        */tls)
                # TLS test
-               certdir=$(pwd)/certs
                cat >${conffile} <<EOF
 [generic]
        certfile = $certdir/server-cert.pem
@@ -331,7 +331,6 @@ EOF
        */tlshuge)
                # TLS test with big operations
                # takes a while
-               certdir=$(pwd)/certs
                cat >${conffile} <<EOF
 [generic]
        certfile = $certdir/server-cert.pem
@@ -352,7 +351,6 @@ EOF
                retval=$?
        ;;
        */tlswrongcert)
-               certdir=$(pwd)/certs
                cat >${conffile} <<EOF
 [generic]
        certfile = $certdir/server-cert.pem