From: Jim Meyering <jim@meyering.net>
Date: Sun, 7 Sep 2003 17:21:48 +0000 (+0000)
Subject: Write ^D as \cD.
X-Git-Tag: v5.0.91~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f36aa51213dc59ae1ab72ba74b6f1f4529f0842;p=thirdparty%2Fcoreutils.git

Write ^D as \cD.
Complete the change of 2003-08-02.
---

diff --git a/tests/misc/tty-eof b/tests/misc/tty-eof
index c0c7b4b8d8..da2e50d1f1 100755
--- a/tests/misc/tty-eof
+++ b/tests/misc/tty-eof
@@ -39,12 +39,13 @@ $@ and (warn "$ME: this script requires Perl's Expect package >=1.11\n"),
       # No input for cut -f2.
       $cmd =~ /^cut/
 	or $exp->send("a b\n");
-      $exp->send('');  # FIXME: it'd be better not to hard-code ^D here
+      $exp->send("\cD");  # This is Control-D.  FIXME: what if that's not EOF?
       $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');
-      defined $found
+      # 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"),
 	  $fail=1, next;
       defined defined $exp->exitstatus