tests: Fix running schematests directly from topdir

Previously it failed like:

$ ./tests/domainschematest
./tests/domainschematest: line 4: ./test-lib.sh: No such file or directory

diff --git a/tests/capabilityschematest b/tests/capabilityschematest
index 443984237680dcd43092b4ea4dc857c654e7a2c1..78fbc8ee0cc2392dad335b841da26f30b0df7aa7 100755 (executable)
--- a/tests/capabilityschematest
+++ b/tests/capabilityschematest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-: ${srcdir=.}
+: ${srcdir=$(dirname $0)}
 . $srcdir/test-lib.sh
 . $abs_srcdir/schematestutils.sh
 

diff --git a/tests/domaincapsschematest b/tests/domaincapsschematest
index 9baf44a4734ff5b57a329387fcc3801d0f5b8377..2c19ac40048f8b10b8068b7cba689484b54d7fbc 100755 (executable)
--- a/tests/domaincapsschematest
+++ b/tests/domaincapsschematest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-: ${srcdir=.}
+: ${srcdir=$(dirname $0)}
 . $srcdir/test-lib.sh
 . $abs_srcdir/schematestutils.sh
 

diff --git a/tests/domainschematest b/tests/domainschematest
index ba9018091a7968aebbcde1592528b2db67278e89..31ee536b250c436cf62c82217a47774f8888a49a 100755 (executable)
--- a/tests/domainschematest
+++ b/tests/domainschematest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-: ${srcdir=.}
+: ${srcdir=$(dirname $0)}
 . $srcdir/test-lib.sh
 . $abs_srcdir/schematestutils.sh
 

diff --git a/tests/domainsnapshotschematest b/tests/domainsnapshotschematest
index 1bdc5393cdd9eec85e1b410589b5dca8518c9df7..ba28e051f1db0c7ebc92e87423d760ed3f320ee6 100755 (executable)
--- a/tests/domainsnapshotschematest
+++ b/tests/domainsnapshotschematest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-: ${srcdir=.}
+: ${srcdir=$(dirname $0)}
 . $srcdir/test-lib.sh
 . $abs_srcdir/schematestutils.sh
 

diff --git a/tests/interfaceschematest b/tests/interfaceschematest
index 1ddbc53fac0bd2c6a0fc8e97641aa7b15d626336..47745eaf65f8f1d7b58007eb783d3afa40ad5aa5 100755 (executable)
--- a/tests/interfaceschematest
+++ b/tests/interfaceschematest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-: ${srcdir=.}
+: ${srcdir=$(dirname $0)}
 . $srcdir/test-lib.sh
 . $abs_srcdir/schematestutils.sh
 

diff --git a/tests/networkschematest b/tests/networkschematest
index 46f3fc52b55e13d2e7d90c117866b0f736856be4..fe46893eadc690102e24441af00c473ac1768cd4 100755 (executable)
--- a/tests/networkschematest
+++ b/tests/networkschematest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-: ${srcdir=.}
+: ${srcdir=$(dirname $0)}
 . $srcdir/test-lib.sh
 . $abs_srcdir/schematestutils.sh
 

diff --git a/tests/nodedevschematest b/tests/nodedevschematest
index 03a15779e4da9806a53041709bad0ccbdd3f3c15..07b1f7b4a04347bf72298144aa5b17184bb0e7c1 100755 (executable)
--- a/tests/nodedevschematest
+++ b/tests/nodedevschematest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-: ${srcdir=.}
+: ${srcdir=$(dirname $0)}
 . $srcdir/test-lib.sh
 . $abs_srcdir/schematestutils.sh
 

diff --git a/tests/nwfilterschematest b/tests/nwfilterschematest
index 2c50c03322139c86197957c77078e983ce6564d8..8703e21b4ccd53b635c479006ab697eeab494e78 100755 (executable)
--- a/tests/nwfilterschematest
+++ b/tests/nwfilterschematest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-: ${srcdir=.}
+: ${srcdir=$(dirname $0)}
 . $srcdir/test-lib.sh
 . $abs_srcdir/schematestutils.sh
 

diff --git a/tests/secretschematest b/tests/secretschematest
index f64d1a3e15846edb8f53560481631ce14f36b058..23b0e2f4441ca2fa7e2ca77fb0a79779f620d2d8 100755 (executable)
--- a/tests/secretschematest
+++ b/tests/secretschematest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-: ${srcdir=.}
+: ${srcdir=$(dirname $0)}
 . $srcdir/test-lib.sh
 . $abs_srcdir/schematestutils.sh
 

diff --git a/tests/storagepoolschematest b/tests/storagepoolschematest
index d54b827c173dffb44e7310aee03beac3dc4addd9..ebea71104b589c9986723094ac7b4c0a1404c8f0 100755 (executable)
--- a/tests/storagepoolschematest
+++ b/tests/storagepoolschematest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-: ${srcdir=.}
+: ${srcdir=$(dirname $0)}
 . $srcdir/test-lib.sh
 . $abs_srcdir/schematestutils.sh
 

diff --git a/tests/storagevolschematest b/tests/storagevolschematest
index 9045e6b4143e271ab8e5f9e9ca44d800b8f16fc7..395df572f467ad1708451c1e6ee91203e708ab17 100755 (executable)
--- a/tests/storagevolschematest
+++ b/tests/storagevolschematest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-: ${srcdir=.}
+: ${srcdir=$(dirname $0)}
 . $srcdir/test-lib.sh
 . $abs_srcdir/schematestutils.sh
 

diff --git a/tests/test-lib.sh b/tests/test-lib.sh
index aff179c7929dbd5553275bfa4097e9c013c74eb0..920b01e3f87bbcae5ff39fc1ea6d8c509545217d 100644 (file)
--- a/tests/test-lib.sh
+++ b/tests/test-lib.sh
@@ -18,10 +18,11 @@
 #
 # Based on an idea from GNU coreutils
 
-test -z "$abs_srcdir" && abs_srcdir=$(pwd)
-test -z "$abs_builddir" && abs_builddir=$(pwd)
-test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/..
-test -z "$abs_top_builddir" && abs_top_builddir=$(pwd)/..
+_scriptdir="$(realpath $(dirname $0))"
+test -z "$abs_srcdir" && abs_srcdir=$_scriptdir
+test -z "$abs_builddir" && abs_builddir=$_scriptdir
+test -z "$abs_top_srcdir" && abs_top_srcdir=$_scriptdir/..
+test -z "$abs_top_builddir" && abs_top_builddir=$_scriptdir/..
 test -z "$LC_ALL" && LC_ALL=C
 
 # Skip this test if the shell lacks support for functions.