mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-02-14 03:12:10 +02:00
* tests/misc/sort-continue: Port to Fedora 15.
Redirect with the shell command, not in a separate 'exec'. Without this patch, Fedora 15 x86-64 /bin/sh (i.e., Bash 4.2.10) complained about running out of file descriptors in the shell.
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
print_ver_ sort
|
||||
|
||||
# Skip the test when running under valgrind.
|
||||
( ulimit -n 6; sort < /dev/null ) \
|
||||
( ulimit -n 6; sort 3<&- 4<&- 5<&- < /dev/null ) \
|
||||
|| skip_ 'fd-limited sort failed; are you running under valgrind?'
|
||||
|
||||
for i in $(seq 31); do
|
||||
@@ -30,8 +30,7 @@ done
|
||||
|
||||
(
|
||||
ulimit -n 6
|
||||
exec 0</dev/null 3<&- 4<&- 5<&-
|
||||
sort -n -m __test.* > out
|
||||
sort -n -m __test.* 3<&- 4<&- 5<&- < /dev/null > out
|
||||
) &&
|
||||
compare in out ||
|
||||
{ fail=1; echo 'file descriptor exhaustion not handled' 1>&2; }
|
||||
@@ -39,8 +38,7 @@ compare in out ||
|
||||
echo 32 | tee -a in > in1
|
||||
(
|
||||
ulimit -n 6
|
||||
exec 3<&- 4<&- 5<&-
|
||||
sort -n -m __test.* - < in1 > out
|
||||
sort -n -m __test.* - 3<&- 4<&- 5<&- < in1 > out
|
||||
) &&
|
||||
compare in out || { fail=1; echo 'stdin not handled properly' 1>&2; }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user