Merge branch 'jk/lib-terminal-lazy'

The test helper lib-terminal always run an actual test_expect_* when
included, which screwed up with the use of skil-all that may have to
be done later.

* jk/lib-terminal-lazy:
  t/lib-terminal: make TTY a lazy prerequisite

diff --cc t/lib-terminal.sh
index 9a2dca5,920da3a..5184549
--- 1/t/lib-terminal.sh
--- 2/t/lib-terminal.sh
+++ b/t/lib-terminal.sh
@@@ -1,6 -1,20 +1,20 @@@
 -#!/bin/sh
 +# Helpers for terminal output tests.
  
- test_expect_success PERL 'set up terminal for tests' '
+ # Catch tests which should depend on TTY but forgot to. There's no need
+ # to aditionally check that the TTY prereq is set here.  If the test declared
+ # it and we are running the test, then it must have been set.
+ test_terminal () {
+       if ! test_declared_prereq TTY
+       then
+               echo >&4 "test_terminal: need to declare TTY prerequisite"
+               return 127
+       fi
+       perl "$TEST_DIRECTORY"/test-terminal.perl "$@"
+ }
+ 
+ test_lazy_prereq TTY '
+       test_have_prereq PERL &&
+ 
        # Reading from the pty master seems to get stuck _sometimes_
        # on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
        #