From: Andreas Jaeger <aj@suse.de>
Date: Thu, 27 Apr 2000 04:06:31 +0000 (+0000)
Subject: 2000-04-18  H.J. Lu  <hjl@gnu.org>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=507189ee58fddfdf11280a304d454f22c1da9e5d;p=thirdparty%2Fglibc.git

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 ca85cae9cd2..41a4a5be076 100644
--- 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 b8509fcaaac..2dc21ce215b 100755
--- 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" |