Pass config file name into test scripts

Rather than having each test script hard code the config file that
should be use, have the top level runtests script pass the filename
to use as the config in as a command line parameter.

diff --git a/runtests b/runtests
index 968cfc03fad5696d6f928f7bedf5809604fd017d..495e7b5ed39408f55c472df79cae866024ebe093 100755 (executable)
--- a/runtests
+++ b/runtests
@@ -23,7 +23,7 @@ for t in libkeydb_*.so; do
                for t in t/$backend-*.t t/all-*.t; do
                        total=`expr $total + 1`
                        mkdir t/db/
-                       if ! $t $backend; then
+                       if ! $t test.conf $backend; then
                                echo "test $t failed" >&2
                                fail=`expr $fail + 1`
                        fi

diff --git a/t/all-020-get.t b/t/all-020-get.t
index a96f8961cb5c8cb312f28757dc9a5a4ca24b8a02..75649286a469ea7d8ed7eec5d7eb5b02a3d231a4 100755 (executable)
--- a/t/all-020-get.t
+++ b/t/all-020-get.t
@@ -4,8 +4,8 @@
 set -e
 
 cd t
-../onak -b -c test.conf add < ../keys/noodles.key
-if ! ../onak -c test.conf get 0x94FA372B2DA8B985 2> /dev/null | \
+../onak -b -c $1 add < ../keys/noodles.key
+if ! ../onak -c $1 get 0x94FA372B2DA8B985 2> /dev/null | \
        grep -q -- '-----BEGIN PGP PUBLIC KEY BLOCK-----'; then
        echo "* Did not correctly retrieve key by keyid."
        exit 1

diff --git a/t/all-030-get-fail.t b/t/all-030-get-fail.t
index 0db2b2876aa8a591ff668e1b4b15a5d43888ba92..8d1bea66896b95810b3348c53af18a117971a195 100755 (executable)
--- a/t/all-030-get-fail.t
+++ b/t/all-030-get-fail.t
@@ -4,8 +4,8 @@
 set -e
 
 cd t
-../onak -b -c test.conf add < ../keys/noodles.key
-if ! ../onak -c test.conf get 0x12345678 2>&1 | \
+../onak -b -c $1 add < ../keys/noodles.key
+if ! ../onak -c $1 get 0x12345678 2>&1 | \
        grep -q 'Key not found'; then
        echo "* Did not correctly error on non-existent key"
        exit 1

diff --git a/t/all-040-index-text.t b/t/all-040-index-text.t
index f5b1c14e1c82ed3e0cd16ad237c1cca48c731147..af82b9e3961861ee43d549b1c1c07905b62e3003 100755 (executable)
--- a/t/all-040-index-text.t
+++ b/t/all-040-index-text.t
@@ -5,13 +5,13 @@ 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 index noodles 2> /dev/null | \
+../onak -b -c $1 add < ../keys/noodles.key
+if ! ../onak -c $1 index noodles 2> /dev/null | \
        grep -q -- 'pub   4096R/2DA8B985 2008/06/03 Jonathan McDowell'; then
        echo "* Did not correctly retrieve key by text"
        exit 1

diff --git a/t/all-050-get-hash.t b/t/all-050-get-hash.t
index 4913134e899c23ef79c0a86b3404dfdedec279b3..ef83dc255dfc6fee4db2f84046f2a68648591951 100755 (executable)
--- a/t/all-050-get-hash.t
+++ b/t/all-050-get-hash.t
@@ -5,13 +5,13 @@ 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 hget 81929DAE08B8F80888DA524923B93067 2> /dev/null | \
+../onak -b -c $1 add < ../keys/noodles.key
+if ! ../onak -c $1 hget 81929DAE08B8F80888DA524923B93067 2> /dev/null | \
        grep -q -- '-----BEGIN PGP PUBLIC KEY BLOCK-----'; then
        echo "* Did not correctly retrieve key by text"
        exit 1

diff --git a/t/all-060-get-fingerprint.t b/t/all-060-get-fingerprint.t
index 920e9a338dbcc8a66e8ad4ff9ec591980eb46235..e79c636f7eb6beda0821abb58d5d4feb3812df0c 100755 (executable)
--- a/t/all-060-get-fingerprint.t
+++ b/t/all-060-get-fingerprint.t
@@ -4,8 +4,8 @@
 set -e
 
 cd t
-../onak -b -c test.conf add < ../keys/noodles.key
-if ! ../onak -c test.conf get 0x0E3A94C3E83002DAB88CCA1694FA372B2DA8B985 2> /dev/null | \
+../onak -b -c $1 add < ../keys/noodles.key
+if ! ../onak -c $1 get 0x0E3A94C3E83002DAB88CCA1694FA372B2DA8B985 2> /dev/null | \
        grep -q -- '-----BEGIN PGP PUBLIC KEY BLOCK-----'; then
        echo "* Did not correctly retrieve key by keyid."
        exit 1

diff --git a/t/all-070-get-short.t b/t/all-070-get-short.t
index 8adaa3f43693f9bbe9a4d5797a5275f24ee54390..b8431a61feeae453ef8976e3e42c11129eca8bd7 100755 (executable)
--- a/t/all-070-get-short.t
+++ b/t/all-070-get-short.t
@@ -4,8 +4,8 @@
 set -e
 
 cd t
-../onak -b -c test.conf add < ../keys/noodles.key
-if ! ../onak -c test.conf get 0x2DA8B985 2> /dev/null | \
+../onak -b -c $1 add < ../keys/noodles.key
+if ! ../onak -c $1 get 0x2DA8B985 2> /dev/null | \
        grep -q -- '-----BEGIN PGP PUBLIC KEY BLOCK-----'; then
        echo "* Did not correctly retrieve key by keyid."
        exit 1

diff --git a/t/all-080-get-subkey.t b/t/all-080-get-subkey.t
index ecccdf44e56175220288e26363f6543883d324c7..449b5687f7017bb54ead83ecdeec2d10fc0c4df3 100755 (executable)
--- a/t/all-080-get-subkey.t
+++ b/t/all-080-get-subkey.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 0x045281F1B9A66E35 2> /dev/null | \
+../onak -b -c $1 add < ../keys/noodles.key
+if ! ../onak -c $1 get 0x045281F1B9A66E35 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 0xFF162FC5CF3FBAD1 2> /dev/null | \
+if ! ../onak -c $1 get 0xFF162FC5CF3FBAD1 2> /dev/null | \
        grep -q -- '-----BEGIN PGP PUBLIC KEY BLOCK-----'; then
        echo "* Did not correctly retrieve key by subkey id."
        exit 1

diff --git a/t/all-090-get-subkey-short.t b/t/all-090-get-subkey-short.t
index 891a566da73b025e6e9d577f7fe225a466e29035..d120598969ea13a181778b336c23ed1875a072fc 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 | \
+../onak -b -c $1 add < ../keys/noodles.key
+if ! ../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 ! ../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

diff --git a/t/db4-000-add.t b/t/db4-000-add.t
index c69cabbb9f6d255c511f0253153b60bd838cf931..83bece671859269904c0aae1ffc3f0aee69c1133 100755 (executable)
--- a/t/db4-000-add.t
+++ b/t/db4-000-add.t
@@ -4,7 +4,7 @@
 set -e
 
 cd t
-../onak -b -c test.conf add < ../keys/noodles.key
+../onak -b -c $1 add < ../keys/noodles.key
 if [ ! -e db/worddb -o ! -e db/id32db -o ! -e db/keydb.0.db ]; then
        echo Did not correctly add key using db4 backend.
        exit 1

diff --git a/t/file-000-add.t b/t/file-000-add.t
index cd7a4c5b0e05dba44922e5ec0fa436ed92669318..dbfb8118aa469589c12c8a6387a32d2a25e7bea3 100755 (executable)
--- a/t/file-000-add.t
+++ b/t/file-000-add.t
@@ -4,7 +4,7 @@
 set -e
 
 cd t
-../onak -b -c test.conf add < ../keys/noodles.key
+../onak -b -c $1 add < ../keys/noodles.key
 if [ ! -e db/0x2DA8B985 ]; then
        echo Did not correctly add key using file backend.
        exit 1

diff --git a/t/file-010-del.t b/t/file-010-del.t
index 31acc5a2c73211484bf30b1510f405513628dba0..edceea1bf172327434669f868581b3a094a67147 100755 (executable)
--- a/t/file-010-del.t
+++ b/t/file-010-del.t
@@ -4,8 +4,8 @@
 set -e
 
 cd t
-../onak -b -c test.conf add < ../keys/noodles.key
-../onak -b -c test.conf delete 0x2DA8B985
+../onak -b -c $1 add < ../keys/noodles.key
+../onak -b -c $1 delete 0x2DA8B985
 if [ -e db/0x2DA8B985 ]; then
        echo "* Did not correctly delete key using file backend"
        exit 1

diff --git a/t/fs-000-add.t b/t/fs-000-add.t
index c20231e61b0f0b04cf0b2fb373a773b61b7a7aad..1864417c57726d99c6cc1bd47ea81c22c997a01f 100755 (executable)
--- a/t/fs-000-add.t
+++ b/t/fs-000-add.t
@@ -4,7 +4,7 @@
 set -e
 
 cd t
-../onak -b -c test.conf add < ../keys/noodles.key
+../onak -b -c $1 add < ../keys/noodles.key
 if [ ! -e db/key/2D/A8/2DA8B985/94FA372B2DA8B985 ]; then
        echo Did not correctly add key using fs backend.
        exit 1

diff --git a/t/fs-010-del.t b/t/fs-010-del.t
index 43fa7b01033290fe7ce9a1e7f747f01a8abb8d8b..5ea794b0ed88ae14477d26f7f282704b0dd9bb3e 100755 (executable)
--- a/t/fs-010-del.t
+++ b/t/fs-010-del.t
@@ -4,8 +4,8 @@
 set -e
 
 cd t
-../onak -b -c test.conf add < ../keys/noodles.key
-../onak -b -c test.conf delete 0x2DA8B985
+../onak -b -c $1 add < ../keys/noodles.key
+../onak -b -c $1 delete 0x2DA8B985
 if [ -e db/key/2D/A8/2DA8B985/94FA372B2DA8B985 ]; then
        echo "* Did not correctly delete key using fs backend"
        exit 1