[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 22/32] test setup: move actual calling of testsuite setup in ./de
From: |
Stefano Lattarini |
Subject: |
[PATCH 22/32] test setup: move actual calling of testsuite setup in ./defs |
Date: |
Thu, 26 Jul 2012 14:04:48 +0200 |
* t/ax/test-init.sh: Move call to 'am_test_setup' ...
* defs: ... here.
Signed-off-by: Stefano Lattarini <address@hidden>
---
defs | 6 ++++--
t/ax/test-init.sh | 6 ------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/defs b/defs
index 01e90b8..93b0bfd 100644
--- a/defs
+++ b/defs
@@ -18,6 +18,8 @@
# Source the shell static setup and variable definitions.
. test-defs.sh; test $? -eq 0 || exit 99
-# Source the actual test initialization and setup code, and return
-# control to the test script that is sourcing us.
+# Source the actual code for test initialization and setup.
. test-init.sh
+
+# Run that setup, and return control to the test script sourcing us.
+am_test_setup
diff --git a/t/ax/test-init.sh b/t/ax/test-init.sh
index 7817fe9..1cf5f5f 100644
--- a/t/ax/test-init.sh
+++ b/t/ax/test-init.sh
@@ -1028,9 +1028,3 @@ am_test_setup ()
set -x
pwd
}
-
-## ---------------- ##
-## Ready to go... ##
-## ---------------- ##
-
-am_test_setup
--
1.7.12.rc0
- [PATCH 18/32] test init: refactor: new function 'am_setup_testdir', (continued)
- [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, 2012/07/26
- [PATCH 22/32] test setup: move actual calling of testsuite setup in ./defs,
Stefano Lattarini <=
- [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
- Re: [PATCH 00/32] {maint} Several testsuite refactorings, Stefano Lattarini, 2012/07/26