[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 25/32] tests: source test defs in the generic test lib
From: |
Stefano Lattarini |
Subject: |
[PATCH 25/32] tests: source test defs in the generic test lib |
Date: |
Thu, 26 Jul 2012 14:04:51 +0200 |
* t/ax/test-lib.sh: That is, here ...
* defs: ... rather than here.
Signed-off-by: Stefano Lattarini <address@hidden>
---
defs | 3 ---
t/ax/test-lib.sh | 5 +++++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/defs b/defs
index ea6c84c..1ee1116 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 1efcaa9..f711f1e 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
--
1.7.12.rc0
- [PATCH 14/32] test init: refactor: new function 'process_requirements', (continued)
- [PATCH 14/32] test init: refactor: new function 'process_requirements', Stefano Lattarini, 2012/07/26
- [PATCH 18/32] test init: refactor: new function 'am_setup_testdir', Stefano Lattarini, 2012/07/26
- [PATCH 13/32] test init: refactor: new function 'require_tool', Stefano Lattarini, 2012/07/26
- [PATCH 17/32] test init: refactor: new function 'am_set_exit_traps', Stefano Lattarini, 2012/07/26
- [PATCH 11/32] tests: simplify sourcing of helper shell files, Stefano Lattarini, 2012/07/26
- [PATCH 19/32] test init: refactor: move displaying of debugging info later, Stefano Lattarini, 2012/07/26
- [PATCH 16/32] configure: testsuite shell set exit traps in shell functions, Stefano Lattarini, 2012/07/26
- [PATCH 21/32] test setup: merge definitions of function for simple tests, Stefano Lattarini, 2012/07/26
- [PATCH 23/32] tests: split test libs into "generic" and "automake-specific", Stefano Lattarini, 2012/07/26
- [PATCH 27/32] configure: testsuite shell can return early from "dot-sourced" files, Stefano Lattarini, 2012/07/26
- [PATCH 25/32] tests: source test defs in the generic test lib,
Stefano Lattarini <=
- [PATCH 22/32] test setup: move actual calling of testsuite setup in ./defs, Stefano Lattarini, 2012/07/26
- [PATCH 26/32] tests: move sanitization and "Bournification" in the generic test lib, Stefano Lattarini, 2012/07/26
- [PATCH 24/32] test defs: no need to re-add $srcdir/t/ax to $PATH, Stefano Lattarini, 2012/07/26
- [PATCH 20/32] test init: refactor: new function 'am_test_setup', Stefano Lattarini, 2012/07/26
- [PATCH 28/32] tests: protect test libs against multiple inclusion, Stefano Lattarini, 2012/07/26
- [PATCH 29/32] tests: "am_using_tap=yes" -> "am_test_protocol=tap", Stefano Lattarini, 2012/07/26
- [PATCH 31/32] runtest: sanitize test environment, Stefano Lattarini, 2012/07/26
- [PATCH 30/32] tests: remove an obsolescent self test, Stefano Lattarini, 2012/07/26
- [PATCH 32/32] tests: never source test-defs.sh directly, source test-lib.sh instead, Stefano Lattarini, 2012/07/26
- [PATCH 33/32] maintcheck: fixup list of files in $(xdefs), Stefano Lattarini, 2012/07/26