Fix handling of other signature requirement

[onak.git] / t / all-090-get-subkey-short.t

diff --git a/t/all-090-get-subkey-short.t b/t/all-090-get-subkey-short.t
index 891a566da73b025e6e9d577f7fe225a466e29035..9927a1ef845f5d740f9290fc27828f23f22b0e4b 100755 (executable)
--- a/t/all-090-get-subkey-short.t
+++ b/t/all-090-get-subkey-short.t
@@ -5,18 +5,18 @@ set -e
 
 # Backends should really support this, but the file one is as simple as
 # possible, so doesn't. Skip the test for it.
-if [ "$1" = "file" ]; then
+if [ "$2" = "file" ]; then
        exit 0
 fi
 
-cd t
-../onak -b -c test.conf add < ../keys/noodles.key
-if ! ../onak -c test.conf get 0xB9A66E35 2> /dev/null | \
+cd ${WORKDIR}
+${BUILDDIR}/onak -b -c $1 add < ${TESTSDIR}/../keys/noodles.key
+if ! ${BUILDDIR}/onak -c $1 get 0xB9A66E35 2> /dev/null | \
        grep -q -- '-----BEGIN PGP PUBLIC KEY BLOCK-----'; then
        echo "* Did not correctly retrieve key by subkey id."
        exit 1
 fi
-if ! ../onak -c test.conf get 0xCF3FBAD1 2> /dev/null | \
+if ! ${BUILDDIR}/onak -c $1 get 0xCF3FBAD1 2> /dev/null | \
        grep -q -- '-----BEGIN PGP PUBLIC KEY BLOCK-----'; then
        echo "* Did not correctly retrieve key by subkey id."
        exit 1