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>
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.
# TAP support:
# - colorized testsuite summary
-. test-defs.sh
+. test-lib.sh
use_colors=yes
. tap-summary-aux.sh
# TAP support:
# - colorized testsuite summary
-. test-defs.sh
+. test-lib.sh
use_colors=no
. tap-summary-aux.sh
# 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
# 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