tests: move input-tty into a test-lib.sh function

* tests/test-lib.sh (require_controlling_input_terminal_): New function, from
* tests/input-tty: ...here.  Remove file.
* tests/Makefile.am (EXTRA_DIST): Remove input-tty.
* tests/mv/i-3: Use the function, not the file.
* tests/misc/stty: Likewise.
* tests/misc/stty-row-col: Likewise.
* tests/misc/stty-invalid: Likewise.

3 files changed, 3 insertions, 5 deletions

diff --git a/tests/misc/stty b/tests/misc/stty
index 8b5fbff00..8216c8e81 100755
--- a/tests/misc/stty
+++ b/tests/misc/stty
@@ -22,8 +22,8 @@ if test "$VERBOSE" = yes; then
 fi
 
 # Make sure there's a tty on stdin.
-. $srcdir/input-tty
 . $srcdir/test-lib.sh
+require_controlling_input_terminal_
 
 # The following list of reversible options was generated with
 # grep -w REV stty.c|sed -n '/^  {"/{s//REV_/;s/".*/=1/;p;}'|fmt
diff --git a/tests/misc/stty-invalid b/tests/misc/stty-invalid
index 168bb59af..302dbe0ec 100755
--- a/tests/misc/stty-invalid
+++ b/tests/misc/stty-invalid
@@ -21,9 +21,8 @@ if test "$VERBOSE" = yes; then
   stty --version
 fi
 
-# Make sure there's a tty on stdin.
-. $srcdir/input-tty
 . $srcdir/test-lib.sh
+require_controlling_input_terminal_
 
 fail=0
 
diff --git a/tests/misc/stty-row-col b/tests/misc/stty-row-col
index 7fc917fa4..8ac114336 100755
--- a/tests/misc/stty-row-col
+++ b/tests/misc/stty-row-col
@@ -36,9 +36,8 @@ export COLUMNS
 LC_ALL=C
 export LC_ALL
 
-# Make sure there's a tty on stdin.
-. $srcdir/input-tty
 . $srcdir/test-lib.sh
+require_controlling_input_terminal_
 
 # Versions of GNU stty from shellutils-1.9.2c and earlier failed
 # tests #2 and #4 when run on SunOS 4.1.3.