From 6925bbc37e0c868315820f50ef90c492600459e7 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Fri, 10 Sep 2004 15:51:07 +0000 Subject: [PATCH] - Don't run tests that read from /dev/tty. --- bash-tty-tests.patch | 29 +++++++++++++++++++++++++++++ bash.spec | 3 +++ 2 files changed, 32 insertions(+) create mode 100644 bash-tty-tests.patch diff --git a/bash-tty-tests.patch b/bash-tty-tests.patch new file mode 100644 index 0000000..9cdff2b --- /dev/null +++ b/bash-tty-tests.patch @@ -0,0 +1,29 @@ +--- bash-3.0/tests/read.tests.tty-tests 2004-03-14 22:18:02.000000000 +0000 ++++ bash-3.0/tests/read.tests 2004-09-10 16:41:32.746099025 +0100 +@@ -82,9 +82,6 @@ + # test read -d delim behavior + ${THIS_SH} ./read1.sub + +-# test read -t timeout behavior +-${THIS_SH} ./read2.sub +- + # test read -n nchars behavior + ${THIS_SH} ./read3.sub + +--- bash-3.0/tests/read.right.tty-tests 2004-03-14 22:18:16.000000000 +0000 ++++ bash-3.0/tests/read.right 2004-09-10 16:41:32.751098072 +0100 +@@ -33,14 +33,6 @@ + a = xyz + a = -xyz 123- + a = abc +-1 +-4 +-1 +-4 +-./read2.sub: line 13: read: -3: invalid timeout specification +-1 +-4 +-abcde + ./read3.sub: line 4: read: -1: invalid number + abc + ab diff --git a/bash.spec b/bash.spec index cd00d17..429cbda 100644 --- a/bash.spec +++ b/bash.spec @@ -41,6 +41,7 @@ Patch28: bash-2.05b-xcc.patch Patch29: bash-2.05b-pgrp_sync.patch Patch30: bash-2.05b-manso.patch Patch31: bash-2.05b-debuginfo.patch +Patch32: bash-tty-tests.patch Patch42: bash-sigpipe.patch Prefix: %{_prefix} Requires: mktemp @@ -97,6 +98,7 @@ popular and powerful, and you'll probably end up using it. %patch29 -p1 -b .pgrp_sync %patch30 -p1 -b .manso %patch31 -p1 -b .debuginfo +%patch32 -p1 -b .tty-tests %patch42 -p1 -b .sigpipe echo %{version} > _distribution echo %{release} > _patchlevel @@ -239,6 +241,7 @@ fi %changelog * Fri Sep 10 2004 Tim Waugh 3.0-14 +- Don't run tests that read from /dev/tty. - Patchlevel 13. * Wed Sep 8 2004 Tim Waugh 3.0-13