aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xposix/globtest.sh12
2 files changed, 6 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 2289908..6adf933 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* intl/ngettext.c [!_LIBC]: Fix definition of NGETTEXT.
diff --git a/posix/globtest.sh b/posix/globtest.sh
index 27e340c..956a5e6 100755
--- a/posix/globtest.sh
+++ b/posix/globtest.sh
@@ -235,12 +235,6 @@ echo ~ | cmp - $testout || result=1
${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
${common_objpfx}posix/globtest -q -t "$testdir" "~/" |
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 /.
if test ~/ = //; then
echo / | cmp - $testout || result=1
@@ -248,6 +242,12 @@ else
echo ~/ | cmp - $testout || result=1
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
${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
${common_objpfx}posix/globtest -T "$testdir" "~file4" |