From 4fcf43cd2814ae16d981f5f91ad0c7ad45a6ca52 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Thu, 26 Jul 2012 10:09:04 +0200 Subject: [PATCH] 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 --- defs | 3 --- t/ax/test-lib.sh | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/defs b/defs index ea6c84c05..1ee111632 100644 --- 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 1efcaa919..f711f1e3c 100644 --- 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 -- 2.47.2