From f2b8b7659ae48941ab0be64d1663dd673e097d58 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 26 Jul 2012 12:50:32 +0200
Subject: [PATCH] tests: never source test-defs.sh directly, source test-lib.sh
 instead

After the recent re-organization, sourcing 'test-defs.sh' directly might
not work well and cause spurious failures or other unexpected behaviours.
We should source 'test-lib.sh' instead, which contains not more direct
code execution (only definition of shell variables/functions, or sourcing
of other '*.sh' with the same property), is protected against multiple
inclusions, and sources 'test-defs.sh' automatically in in a proper way.

* t/testsuite-summary-count.sh, t/tap-summary.sh, t/tap-summary-color.sh,
t/testsuite-summary-color.sh: Source 'test-lib.sh', not 'test-defs.sh'.
* gen-testsuite-part: Likewise, in the generated wrapper scripts.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---
 gen-testsuite-part           | 2 +-
 t/tap-summary-color.sh       | 2 +-
 t/tap-summary.sh             | 2 +-
 t/testsuite-summary-color.sh | 6 ++----
 t/testsuite-summary-count.sh | 6 ++----
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/gen-testsuite-part b/gen-testsuite-part
index d646b2769..21c26c46d 100755
--- a/gen-testsuite-part
+++ b/gen-testsuite-part
@@ -96,7 +96,7 @@ sub write_wrapper_script ($$$)
   print $file_handle unindent <<EOF;
     #! /bin/sh
     # This file has been automatically generated.  DO NOT EDIT BY HAND!
-    . test-defs.sh
+    . test-lib.sh
     $shell_setup_code
     # In the spirit of VPATH, we prefer a test in the build tree
     # over one in the source tree.
diff --git a/t/tap-summary-color.sh b/t/tap-summary-color.sh
index c84e84838..e9b516bbc 100755
--- a/t/tap-summary-color.sh
+++ b/t/tap-summary-color.sh
@@ -17,7 +17,7 @@
 # TAP support:
 #  - colorized testsuite summary
 
-. test-defs.sh
+. test-lib.sh
 
 use_colors=yes
 . tap-summary-aux.sh
diff --git a/t/tap-summary.sh b/t/tap-summary.sh
index 6e0e798f8..c4bd73937 100755
--- a/t/tap-summary.sh
+++ b/t/tap-summary.sh
@@ -17,7 +17,7 @@
 # TAP support:
 #  - colorized testsuite summary
 
-. test-defs.sh
+. test-lib.sh
 
 use_colors=no
 . tap-summary-aux.sh
diff --git a/t/testsuite-summary-color.sh b/t/testsuite-summary-color.sh
index a0effd689..7278a2f8c 100755
--- a/t/testsuite-summary-color.sh
+++ b/t/testsuite-summary-color.sh
@@ -16,11 +16,9 @@
 
 # Check coloring of the testsuite summary.
 
-. test-defs.sh
-
-use_colors=yes
-use_vpath=no
+. test-lib.sh
 
+use_colors=yes; use_vpath=no
 . testsuite-summary-checks.sh
 
 ./configure
diff --git a/t/testsuite-summary-count.sh b/t/testsuite-summary-count.sh
index 47bb66317..25ecf2750 100755
--- a/t/testsuite-summary-count.sh
+++ b/t/testsuite-summary-count.sh
@@ -16,11 +16,9 @@
 
 # Check test counts in the testsuite summary.
 
-. test-defs.sh
-
-use_colors=no
-use_vpath=no
+. test-lib.sh
 
+use_colors=no; use_vpath=no
 . testsuite-summary-checks.sh
 
 ./configure
-- 
2.47.3