From 548f51f6be65dc24db751e7fed792df48e865df5 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Thu, 27 Apr 2000 04:03:53 +0000
Subject: Remove last entry again since the globtest.sh patch has been
reverted.
---
posix/globtest.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'posix')
diff --git a/posix/globtest.sh b/posix/globtest.sh
index 27e340c14b..956a5e6bb1 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" |
--
cgit v1.2.3