From 8307c5f4a638559230ac9bf3be55202db21b710d6959a6ae675855d324ee627f Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 23 Dec 2025 11:42:23 +0300
Subject: [PATCH] DRY tests initialisation

---
 t/add-get-del.t            | 4 +---
 t/add-traversal.t          | 4 +---
 t/bin.t                    | 5 +----
 t/check-ip-empty.t         | 1 +
 t/check-ipv4-invalid.t     | 1 +
 t/check-ipv4-prefixlen.t   | 1 +
 t/check-ipv4-valid.t       | 1 +
 t/check-ipv6-invalid.t     | 1 +
 t/check-ipv6-prefixlen.t   | 1 +
 t/check-ipv6-valid.t       | 1 +
 t/check-mtu.t              | 1 +
 t/export.t                 | 5 +----
 t/import-path-validation.t | 6 +-----
 t/list.t                   | 3 +--
 t/revert.t                 | 5 +----
 t/set-get.t                | 4 +---
 t/setup.rc                 | 5 +++++
 17 files changed, 21 insertions(+), 28 deletions(-)
 create mode 100644 t/setup.rc

diff --git a/t/add-get-del.t b/t/add-get-del.t
index 34b3209..2712daa 100755
--- 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 625070b..22130ee 100755
--- 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 69dd69d..38ace6c 100755
--- 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 6f4b6c5..8e0f566 100755
--- 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 feb6bdc..5ac97a6 100755
--- 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 8872368..1e094f0 100755
--- 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 bf69a09..c8a8795 100755
--- 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 559d427..cc4d021 100755
--- 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 e98d5e3..ddc108e 100755
--- 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 cd7b4a7..c404c60 100755
--- 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 0a6bbf1..ab0cfe5 100755
--- 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 60c9057..1906176 100755
--- 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 cca8223..7551c87 100755
--- 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 33f3524..77d335e 100755
--- 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 5f62ed2..ea5de38 100755
--- 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 14e64ca..a3ad247 100755
--- 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
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
-- 
2.52.0