tests: misc/tty-eof: increase timeout to avoid unwarranted failure

* tests/misc/tty-eof: Increase timeout from 1s to 10s, to avoid
unwarranted failure under heavy load.
* tests/Makefile.am (TESTS): Move misc/tty-eof "up" to nearer the
beginning of the list (from near the middle) so that it is started
earlier in parallel test runs.  Otherwise, it would frequently be
among the last two tests to complete.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ca190517bfe2ea9265019c4aaab9af0c0a11ccf5..a4370a6d12686b6da2c9c0043d10c9d3dadfbffd 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -87,6 +87,7 @@ TESTS =                                               \
   rm/ext3-perf                                 \
   rm/cycle                                     \
   cp/link-heap                                 \
+  misc/tty-eof                                 \
   tail-2/inotify-hash-abuse                    \
   tail-2/inotify-hash-abuse2                   \
   tail-2/F-vs-missing                          \
@@ -303,7 +304,6 @@ TESTS =                                             \
   misc/truncate-parameters                     \
   misc/truncate-relative                       \
   misc/tsort                                   \
-  misc/tty-eof                                 \
   misc/unexpand                                        \
   misc/uniq                                    \
   misc/uniq-perf                               \

diff --git a/tests/misc/tty-eof b/tests/misc/tty-eof
index 9e866139c2111830843145efc14c8e8cd2892885..e9eed2eacae4a9d5950012848807cc8364d3ebda 100755 (executable)
--- a/tests/misc/tty-eof
+++ b/tests/misc/tty-eof
@@ -75,7 +75,7 @@ $@
       $exp->expect (0, '-re', "^a b\\r?\$");
       my $found = $exp->expect (1, '-re', "^.+\$");
       $found and warn "F: $found: " . $exp->exp_match () . "\n";
-      $exp->expect(1, 'eof');
+      $exp->expect(10, 'eof');
       # Expect no output from cut, since we gave it no input.
       defined $found || $cmd =~ /^cut/
         or (warn "$ME: $cmd didn't produce expected output\n"),