DRY tests initialisation

diff --git a/t/add-get-del.t b/t/add-get-del.t
index 34b3209bbb843b2bb89d42602a4b0b1934f017a15e40bbc3a24d196a715040d0..2712daae59d4044955e8d75d2ed6cfca22d5902f8ef5982d86b01cfcf7c011e5 100755 (executable)
--- a/t/add-get-del.t
+++ b/t/add-get-del.t
@@ -2,9 +2,7 @@
 
 test_description="$(basename $0)"
 . $SHARNESS_TEST_SRCDIR/sharness.sh
-export DSC_SCHEMA=$SHARNESS_TEST_DIRECTORY/../schema
-PATH=$SHARNESS_TEST_DIRECTORY/..:$PATH
-export DSC_STASH=stash
+. $SHARNESS_TEST_DIRECTORY/setup.rc
 
 set -f
 test_expect_success "foo !has" "! dsc has srv/foo"

diff --git a/t/add-traversal.t b/t/add-traversal.t
index 625070b4f69a47c12508ab42a0c26be265986d967d04bb027fd20182fa511981..22130eec1213aa8850927df765a13557a505f6749a1f1839dbbf4c046ab4421b 100755 (executable)
--- a/t/add-traversal.t
+++ b/t/add-traversal.t
@@ -2,9 +2,7 @@
 
 test_description="$(basename $0)"
 . $SHARNESS_TEST_SRCDIR/sharness.sh
-export DSC_SCHEMA=$SHARNESS_TEST_DIRECTORY/../schema
-PATH=$SHARNESS_TEST_DIRECTORY/..:$PATH
-export DSC_STASH=stash
+. $SHARNESS_TEST_DIRECTORY/setup.rc
 
 test_expect_success "traversal bad" "! dsc add net/foo/addr/::1234"
 test_expect_success "net add" "dsc add net/foo"

diff --git a/t/bin.t b/t/bin.t
index 69dd69d4f29a8844cd62bfddc819975f77db653a6780ecd36f9bcce792fbe134..38ace6c42421b4c99596ad747e739fdbecaca2d246456b77787173291236caaa 100755 (executable)
--- a/t/bin.t
+++ b/t/bin.t
@@ -2,10 +2,7 @@
 
 test_description="$(basename $0)"
 . $SHARNESS_TEST_SRCDIR/sharness.sh
-export DSC_SCHEMA=$SHARNESS_TEST_DIRECTORY/../schema
-PATH=$SHARNESS_TEST_DIRECTORY/..:$PATH
-export DSC_STASH=stash DSC_SAVED=saved
-mkdir saved
+. $SHARNESS_TEST_DIRECTORY/setup.rc
 
 dd if=/dev/urandom of=prv bs=64 count=1 2>/dev/null
 test_expect_success "set" "dsc set ssh/prv <prv"

diff --git a/t/check-ip-empty.t b/t/check-ip-empty.t
index 6f4b6c528e41fb99b07202ebd7e59416f638a60fb33a06d81038228d429af51c..8e0f5667a80bfcae0e52138531c16cf29c42f8e88064274d7cdd1bba6c8dded5 100755 (executable)
--- a/t/check-ip-empty.t
+++ b/t/check-ip-empty.t
@@ -2,6 +2,7 @@
 
 test_description="$(basename $0)"
 . $SHARNESS_TEST_SRCDIR/sharness.sh
+. $SHARNESS_TEST_DIRECTORY/setup.rc
 
 echo >in
 test_expect_success "fails" \

diff --git a/t/check-ipv4-invalid.t b/t/check-ipv4-invalid.t
index feb6bdc1a7717dfef0e4a72599cfd87cf4ec99067341cace9b98643bb686bc50..5ac97a6bb59792f8ce0214dff2452668c61be2af7ed63bb7d9499307d36dc6b6 100755 (executable)
--- a/t/check-ipv4-invalid.t
+++ b/t/check-ipv4-invalid.t
@@ -2,6 +2,7 @@
 
 test_description="$(basename $0)"
 . $SHARNESS_TEST_SRCDIR/sharness.sh
+. $SHARNESS_TEST_DIRECTORY/setup.rc
 
 while read addr expected ; do
     echo $addr >in

diff --git a/t/check-ipv4-prefixlen.t b/t/check-ipv4-prefixlen.t
index 88723683fde58b0a2850c6d864a1a2d4020228faef7372f04c836e90e9c47cce..1e094f0d1274332fd4f873c1f7d60236b4d772df01c4a99580652d6a137e9c62 100755 (executable)
--- a/t/check-ipv4-prefixlen.t
+++ b/t/check-ipv4-prefixlen.t
@@ -2,6 +2,7 @@
 
 test_description="$(basename $0)"
 . $SHARNESS_TEST_SRCDIR/sharness.sh
+. $SHARNESS_TEST_DIRECTORY/setup.rc
 
 opt=net/foo/addr/1.2.3.4/prefixlen
 

diff --git a/t/check-ipv4-valid.t b/t/check-ipv4-valid.t
index bf69a091ebb4fc3de138ab74bac522c42a5326257ce3b59de16b0b7d59d01d49..c8a8795f8562063409e61486638c50be7e718a4f1758237a7261621e567e9ce2 100755 (executable)
--- a/t/check-ipv4-valid.t
+++ b/t/check-ipv4-valid.t
@@ -2,6 +2,7 @@
 
 test_description="$(basename $0)"
 . $SHARNESS_TEST_SRCDIR/sharness.sh
+. $SHARNESS_TEST_DIRECTORY/setup.rc
 
 while read addr expected ; do
     echo $addr >in

diff --git a/t/check-ipv6-invalid.t b/t/check-ipv6-invalid.t
index 559d4272d2c28d2c5e17dd7265fb3d1d61fa462a87ee6bccff862c4470ce48e8..cc4d021ab4ce7ac2484737eeb6399278aa9b05c889966992ee0353237091f8ca 100755 (executable)
--- a/t/check-ipv6-invalid.t
+++ b/t/check-ipv6-invalid.t
@@ -2,6 +2,7 @@
 
 test_description="$(basename $0)"
 . $SHARNESS_TEST_SRCDIR/sharness.sh
+. $SHARNESS_TEST_DIRECTORY/setup.rc
 
 while read addr expected ; do
     echo $addr >in

diff --git a/t/check-ipv6-prefixlen.t b/t/check-ipv6-prefixlen.t
index e98d5e3f2392981794e50393514be41d32624433c1674e20a311a5fac3a8e2ee..ddc108e6c9613b7f6da59892c5708a725af4f4e00495a3a71f87c46c3fe63363 100755 (executable)
--- a/t/check-ipv6-prefixlen.t
+++ b/t/check-ipv6-prefixlen.t
@@ -2,6 +2,7 @@
 
 test_description="$(basename $0)"
 . $SHARNESS_TEST_SRCDIR/sharness.sh
+. $SHARNESS_TEST_DIRECTORY/setup.rc
 
 opt=net/foo/addr/2001:db8::1234/prefixlen
 

diff --git a/t/check-ipv6-valid.t b/t/check-ipv6-valid.t
index cd7b4a7b835217df61805212809d96bb1e6127398f30cfe3be5ee74f89ef6580..c404c6065d2dff4e09ba9742d92bef4970fdc5a1beef1ee7b4cf9ff6d8af04aa 100755 (executable)
--- a/t/check-ipv6-valid.t
+++ b/t/check-ipv6-valid.t
@@ -2,6 +2,7 @@
 
 test_description="$(basename $0)"
 . $SHARNESS_TEST_SRCDIR/sharness.sh
+. $SHARNESS_TEST_DIRECTORY/setup.rc
 
 while read addr expected ; do
     echo $addr >in

diff --git a/t/check-mtu.t b/t/check-mtu.t
index 0a6bbf1258a0f4c995adf962a464b4fa6c92c4b78bc6cbf26196274faa540d15..ab0cfe536ab1e2eeaf0e2719a70cc5d4d6d09f79ff3c41e6fb8eae292dd3ad3b 100755 (executable)
--- a/t/check-mtu.t
+++ b/t/check-mtu.t
@@ -2,6 +2,7 @@
 
 test_description="$(basename $0)"
 . $SHARNESS_TEST_SRCDIR/sharness.sh
+. $SHARNESS_TEST_DIRECTORY/setup.rc
 
 opt=net/foo/mtu
 

diff --git a/t/export.t b/t/export.t
index 60c90570e812c63551e08193419cb4edcba65326b45335cc7eb5eb7395acfa85..19061763356e77a526db8c3842662e08e59f3ec43bd0b4ca732a65e2656c1a9b 100755 (executable)
--- a/t/export.t
+++ b/t/export.t
@@ -2,9 +2,7 @@
 
 test_description="$(basename $0)"
 . $SHARNESS_TEST_SRCDIR/sharness.sh
-export DSC_SCHEMA=$SHARNESS_TEST_DIRECTORY/../schema
-PATH=$SHARNESS_TEST_DIRECTORY/..:$PATH
-export DSC_STASH=stash
+. $SHARNESS_TEST_DIRECTORY/setup.rc
 
 test_expect_success "hostname" "dsc set sys/hostname mein"
 
@@ -69,7 +67,6 @@ cat >expected <<EOF
 +world
 EOF
 test_expect_success "cmp" "test_cmp out expected"
-mkdir saved
 test_expect_success "commit" "dsc commit"
 test_expect_success "export" "dsc export >out"
 cat >expected <<EOF

diff --git a/t/import-path-validation.t b/t/import-path-validation.t
index cca82232dc4da2742d4ed2b35e0f0823e525ba21d26e6fa5ef7718449646066a..7551c876c9abda835715e43f1490ef7245d13adc8cbe75c9f4a6a9ee5eecb9b0 100755 (executable)
--- a/t/import-path-validation.t
+++ b/t/import-path-validation.t
@@ -2,10 +2,7 @@
 
 test_description="$(basename $0)"
 . $SHARNESS_TEST_SRCDIR/sharness.sh
-export DSC_SCHEMA=$SHARNESS_TEST_DIRECTORY/../schema
-PATH=$SHARNESS_TEST_DIRECTORY/..:$PATH
-export DSC_STASH=stash DSC_SAVED=saved
-mkdir saved
+. $SHARNESS_TEST_DIRECTORY/setup.rc
 
 cat >in <<EOF
 -- .dirs --
@@ -25,5 +22,4 @@ test_expect_success "import rel" "! dsc import <in >out 2>&1"
 test_expect_success "import rel msg" \
     '[ "$(cat out)" = "relative paths are forbidden" ]'
 
-
 test_done

diff --git a/t/list.t b/t/list.t
index 33f352420a15bbe351ba8dbb44082a345827c47d0701162d0502836dd35bc056..77d335edc5acabeb78dff74f2f456aa01c6b5bfb4a851378fc80c9698ed9cb91 100755 (executable)
--- a/t/list.t
+++ b/t/list.t
@@ -2,8 +2,7 @@
 
 test_description="$(basename $0)"
 . $SHARNESS_TEST_SRCDIR/sharness.sh
-export DSC_SCHEMA=$SHARNESS_TEST_DIRECTORY/../schema
-PATH=$SHARNESS_TEST_DIRECTORY/..:$PATH
+. $SHARNESS_TEST_DIRECTORY/setup.rc
 
 test_expect_success "net ok" "dsc list net >out"
 cat >expected <<EOF

diff --git a/t/revert.t b/t/revert.t
index 5f62ed20520a358f6fb172a205e8662ffd9cfab350e8878ce820d1f6211104df..ea5de3853ba9336e58b6c823155962a265218077673c95afe6444c931f64ccea 100755 (executable)
--- a/t/revert.t
+++ b/t/revert.t
@@ -2,10 +2,7 @@
 
 test_description="$(basename $0)"
 . $SHARNESS_TEST_SRCDIR/sharness.sh
-export DSC_SCHEMA=$SHARNESS_TEST_DIRECTORY/../schema
-PATH=$SHARNESS_TEST_DIRECTORY/..:$PATH
-export DSC_STASH=stash DSC_SAVED=saved
-mkdir saved
+. $SHARNESS_TEST_DIRECTORY/setup.rc
 
 diffpp() {
     perl -i -npe 's/^--- (\S+).*$/--- $1/' $1

diff --git a/t/set-get.t b/t/set-get.t
index 14e64caeafec9bcbd77f2e0631cb0ed3ef1f1ff73a1e318231468131dad735d3..a3ad247e9319fbdb27e5e36f3dd8f7e95dbabccdd75d31d3ba92996e39600566 100755 (executable)
--- a/t/set-get.t
+++ b/t/set-get.t
@@ -2,9 +2,7 @@
 
 test_description="$(basename $0)"
 . $SHARNESS_TEST_SRCDIR/sharness.sh
-export DSC_SCHEMA=$SHARNESS_TEST_DIRECTORY/../schema
-PATH=$SHARNESS_TEST_DIRECTORY/..:$PATH
-export DSC_STASH=stash
+. $SHARNESS_TEST_DIRECTORY/setup.rc
 
 test_expect_success "non-existent set" "! dsc set sys/non-existent"
 

diff --git a/t/setup.rc b/t/setup.rc
new file mode 100644 (file)
index 0000000..0a7f392
--- /dev/null
+++ b/t/setup.rc
@@ -0,0 +1,5 @@
+export DSC_SCHEMA="$SHARNESS_TEST_DIRECTORY/../schema"
+export DSC_STASH=stash DSC_SAVED=saved
+export JIMLIB="$SHARNESS_TEST_DIRECTORY/../jimlib:$JIMLIB"
+PATH="$SHARNESS_TEST_DIRECTORY/..:$PATH"
+mkdir saved