[PATCH 22/32] test setup: move actual calling of testsuite setup in ./defs

[Stefano Lattarini]

* 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