init.sh: make it easier for a test script to write to the tty, ...

when using automake's parallel-tests mode.
* tests/init.sh (stderr_fileno_): Define overridable variable.
(warn_): New function, to use it.
(fail_, skip_, framework_failure_): Use warn_.

diff --git a/ChangeLog b/ChangeLog
index 01369951d61ea75e941df967c8f342c120b015d2..b0dfa6b748d47c10c9e22f9cfbacb9e0cde71027 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-05  Jim Meyering  <meyering@redhat.com>
+
+       init.sh: make it easier for a test script to write to the tty, ...
+       when using automake's parallel-tests mode.
+       * tests/init.sh (stderr_fileno_): Define overridable variable.
+       (warn_): New function, to use it.
+       (fail_, skip_, framework_failure_): Use warn_.
+
 2010-04-04  Bruno Haible  <bruno@clisp.org>
 
        btowc: Avoid warning.

diff --git a/tests/init.sh b/tests/init.sh
index 3154f59517cbe5ea17053f78e0d6ec52dae5be34..23ab131ced0bb19509e7d5a54a1d0a31a1fb1641 100644 (file)
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -96,8 +96,18 @@ test -n "$EXEEXT" && shopt -s expand_aliases
 # sh inside this function.
 Exit () { set +e; (exit $1); exit $1; }
 
-fail_() { echo "$ME_: failed test: $@" 1>&2; Exit 1; }
-skip_() { echo "$ME_: skipped test: $@" 1>&2; Exit 77; }
+# Print warnings (e.g., about skipped and failed tests) to this file number.
+# Override by defining to say, 9, in init.cfg, and putting say,
+# "export ...ENVVAR_SETTINGS...; exec 9>&2; $(SHELL)" in the definition
+# of TESTS_ENVIRONMENT in your tests/Makefile.am file.
+# This is useful when using automake's parallel tests mode, to print
+# the reason for skip/failure to console, rather than to the .log files.
+${stderr_fileno_=2}
+
+warn_() { echo "$@" 1>&$stderr_fileno_; }
+fail_() { warn_ "$ME_: failed test: $@"; Exit 1; }
+skip_() { warn_ "$ME_: skipped test: $@"; Exit 77; }
+framework_failure_() { warn_ "$ME_: set-up failure: $@"; Exit 1; }
 
 # This is a stub function that is run upon trap (upon regular exit and
 # interrupt).  Override it with a per-test function, e.g., to unmount