From 5f567ce4bd46e7d6a2c30f95d8e91b7296dfc6c9 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 3 Oct 2011 13:49:47 +0200 Subject: tests: add a test to exercise today's ls-lL-vs-ACL bug * tests/ls/slink-acl: New file. * tests/Makefile.am (TESTS): Add it. * tests/init.cfg (require_setfacl_): New function. * gnulib: Update to latest, for file-has-acl changes. * NEWS (Bug fixes): Mention it. See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28538. This ":>k; setfacl -m m::r k; ln -s k s; ls -Log s" should print e.g., -rw-r-----+ 1 0 Oct 5 19:22 s With the ls from coreutils-8.13, it would print this (with "." or nothing in place of the "+"): -rw-r-----. 1 0 Oct 5 19:22 s --- tests/Makefile.am | 1 + tests/init.cfg | 6 ++++++ tests/ls/slink-acl | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100755 tests/ls/slink-acl (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 2cf409ae9..9c9a1b8c1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -431,6 +431,7 @@ TESTS = \ ls/readdir-mountpoint-inode \ ls/recursive \ ls/rt-1 \ + ls/slink-acl \ ls/stat-dtype \ ls/stat-failed \ ls/stat-free-color \ diff --git a/tests/init.cfg b/tests/init.cfg index f6eb65159..04abe4faf 100644 --- a/tests/init.cfg +++ b/tests/init.cfg @@ -130,6 +130,12 @@ require_strace_() skip_ 'strace -qe "'"$1"'" does not work' } +require_setfacl_() +{ + setfacl -m user::rwx . \ + || skip_ "setfacl does not work on the current file system" +} + # Require a controlling input `terminal'. require_controlling_input_terminal_() { diff --git a/tests/ls/slink-acl b/tests/ls/slink-acl new file mode 100755 index 000000000..f4d0a115d --- /dev/null +++ b/tests/ls/slink-acl @@ -0,0 +1,33 @@ +#!/bin/sh +# verify that ls -lL works when applied to a symlink to an ACL'd file + +# Copyright (C) 2011 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/init.sh"; path_prepend_ ../src +print_ver_ ls + +require_setfacl_ + +touch k || framework_failure_ +setfacl -m m::r k || framework_failure_ +ln -s k s || framework_failure_ + +set _ $(ls -Log s); shift; link=$1 +set _ $(ls -og k); shift; reg=$1 + +test "$link" = "$reg" || fail=1 + +Exit $fail -- cgit v1.2.3-70-g09d2