From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 10 Apr 2000 15:55:35 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.20~18888
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b6906390e379bc9110583ecab9b73febeae8ac7;p=platform%2Fupstream%2Flinaro-glibc.git

Update.

2000-04-10  Andreas Schwab  <schwab@suse.de>

	* posix/globtest.sh: Skip tests that depend on unreadable
	directories if run as root.
---

diff --git a/ChangeLog b/ChangeLog
index 004dfe0..810528d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-10  Andreas Schwab  <schwab@suse.de>
+
+	* posix/globtest.sh: Skip tests that depend on unreadable
+	directories if run as root.
+
 2000-04-10  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/clock_settime.c (clock_settime): Test tv_nsec value
diff --git a/posix/globtest.sh b/posix/globtest.sh
index e2ba320..60f1bf8 100755
--- a/posix/globtest.sh
+++ b/posix/globtest.sh
@@ -306,13 +306,20 @@ cat <<"EOF" | cmp - $testout || result=1
 GLOB_NOMATCH
 EOF
 
-# ... with GLOB_ERR
-${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
-${common_objpfx}posix/globtest -E "$testdir" "noread/*" |
-sort > $testout
-cat <<"EOF" | cmp - $testout || result=1
+# The following tests will fail if run as root.
+user=`id -un 2> /dev/null`
+if test -z "$user"; then
+    uid="$USER"
+fi
+if test "$user" != root; then
+    # ... with GLOB_ERR
+    ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
+    ${common_objpfx}posix/globtest -E "$testdir" "noread/*" |
+    sort > $testout
+    cat <<"EOF" | cmp - $testout || result=1
 GLOB_ABORTED
 EOF
+fi # not run as root
 
 ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
 ${common_objpfx}posix/globtest -E "$testdir" "noread*/*" |