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.

diff --git a/ChangeLog b/ChangeLog
index ca85cae9cd2e056e7ca076ba732e7ee665c242d9..41a4a5be0769a88f0e6a16ea8b3c17a5da97e547 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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-18  Ulrich Drepper  <drepper@redhat.com>
 
        * po/cs.po: Update from translation team.

diff --git a/posix/globtest.sh b/posix/globtest.sh
index b8509fcaaacf1e09330adc9dfb3f621e398d0ffc..2dc21ce215bcc6cf13a284ffdfaa58cf063cd2c7 100755 (executable)
--- a/posix/globtest.sh
+++ b/posix/globtest.sh
@@ -211,12 +211,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
@@ -224,6 +218,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" |