From: Jim Meyering Date: Wed, 1 Jun 2011 14:08:21 +0000 (+0200) Subject: tests: stat-free-color: accommodate stat of /selinux on rawhide X-Git-Tag: v8.13~129 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccf2d9a4;p=thirdparty%2Fcoreutils.git tests: stat-free-color: accommodate stat of /selinux on rawhide * tests/ls/stat-free-color: This test recently began to fail on rawhide because dynamic library start-up code now stats "/selinux", making the total number of calls 2 rather than the prior 1. Create two more dangling symlinks, so that any erroneous stat- or lstat-calling code will get at least those three. --- diff --git a/tests/ls/stat-free-color b/tests/ls/stat-free-color index 06e621e7e7..b1c474428e 100755 --- a/tests/ls/stat-free-color +++ b/tests/ls/stat-free-color @@ -21,7 +21,9 @@ print_ver_ ls require_strace_ stat require_dirent_d_type_ -ln -s nowhere dangle || framework_failure_ +for i in 1 2 3; do + ln -s nowhere dangle-$i || framework_failure_ +done # Disable enough features via LS_COLORS so that ls --color # can do its job without calling stat (other than the obligatory @@ -49,6 +51,11 @@ eval $(dircolors -b color-without-stat) strace -o log -e stat,lstat,stat64,lstat64 ls --color=always . || fail=1 n_lines=$(wc -l < log) -test $n_lines = 1 || fail=1 + +# Expect one or two stat calls. +case $n_lines in + 1|2) ;; + *) fail=1 ;; +esac Exit $fail