Remove last entry again since the globtest.sh patch has been reverted.

This commit is contained in:
Andreas Jaeger 2000-04-27 04:03:53 +00:00
parent 312afddb24
commit 548f51f6be
2 changed files with 6 additions and 11 deletions

View File

@ -1,8 +1,3 @@
2000-04-18 H.J. Lu <hjl@gnu.org>
* posix/globtest.sh: Properly apply the patch by Ulrich Drepper
<drepper@redhat.com> on 2000-04-13.
2000-04-27 Bruno Haible <clisp.cons.org> 2000-04-27 Bruno Haible <clisp.cons.org>
* intl/ngettext.c [!_LIBC]: Fix definition of NGETTEXT. * intl/ngettext.c [!_LIBC]: Fix definition of NGETTEXT.

View File

@ -235,12 +235,6 @@ echo ~ | cmp - $testout || result=1
${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \ ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
${common_objpfx}posix/globtest -q -t "$testdir" "~/" | ${common_objpfx}posix/globtest -q -t "$testdir" "~/" |
sort > $testout sort > $testout
echo ~/ | cmp - $testout || result=1
# Test tilde expansion with username
${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
${common_objpfx}posix/globtest -q -t "$testdir" "~"$USER |
sort > $testout
# Some shell incorrectly(?) convert ~/ into // if ~ expands to /. # Some shell incorrectly(?) convert ~/ into // if ~ expands to /.
if test ~/ = //; then if test ~/ = //; then
echo / | cmp - $testout || result=1 echo / | cmp - $testout || result=1
@ -248,6 +242,12 @@ else
echo ~/ | cmp - $testout || result=1 echo ~/ | cmp - $testout || result=1
fi fi
# Test tilde expansion with username
${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
${common_objpfx}posix/globtest -q -t "$testdir" "~"$USER |
sort > $testout
eval echo ~$USER | cmp - $testout || result=1
# Tilde expansion shouldn't match a file # Tilde expansion shouldn't match a file
${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \ ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
${common_objpfx}posix/globtest -T "$testdir" "~file4" | ${common_objpfx}posix/globtest -T "$testdir" "~file4" |