tests: source test defs in the generic test lib

* t/ax/test-lib.sh: That is, here ...
* defs: ... rather than here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/defs b/defs
index ea6c84c051ed150783e2ae9c4851e6be6ffaf3ca..1ee1116324f60352960215cede541280942828ad 100644 (file)
--- a/defs
+++ b/defs
@@ -17,9 +17,6 @@
 
 set -e
 
-# Source the shell static setup and variable definitions.
-. test-defs.sh; test $? -eq 0 || exit 99
-
 # Source the actual code for test initialization and setup.
 . test-lib.sh
 . am-test-lib.sh

diff --git a/t/ax/test-lib.sh b/t/ax/test-lib.sh
index 1efcaa919dcbd1800d000aeec522575de433dda1..f711f1e3ca00e57b1c18da7ac1b19891e29f57fd 100644 (file)
--- a/t/ax/test-lib.sh
+++ b/t/ax/test-lib.sh
@@ -31,6 +31,11 @@ nl='
 # is defined initially, so that saving and restoring $IFS works.
 IFS=$sp$tab$nl
 
+# Source extra configuration.
+. test-defs.sh
+# And fail hard if something went wrong.
+test $? -eq 0 || exit 99
+
 # We use a trap below for cleanup.  This requires us to go through
 # hoops to get the right exit status transported through the signal.
 # Turn off errexit here so that we don't trip the bug with OSF1/Tru64