diff options
Diffstat (limited to 'tests/ls')
| -rwxr-xr-x | tests/ls/abmon-align.sh (renamed from tests/ls/abmon-align) | 4 | ||||
| -rwxr-xr-x | tests/ls/block-size.sh (renamed from tests/ls/block-size) | 4 | ||||
| -rwxr-xr-x | tests/ls/capability.sh (renamed from tests/ls/capability) | 4 | ||||
| -rwxr-xr-x | tests/ls/color-clear-to-eol.sh (renamed from tests/ls/color-clear-to-eol) | 4 | ||||
| -rwxr-xr-x | tests/ls/color-dtype-dir.sh (renamed from tests/ls/color-dtype-dir) | 4 | ||||
| -rwxr-xr-x | tests/ls/color-norm.sh (renamed from tests/ls/color-norm) | 4 | ||||
| -rwxr-xr-x | tests/ls/dangle.sh (renamed from tests/ls/dangle) | 4 | ||||
| -rwxr-xr-x | tests/ls/dired.sh (renamed from tests/ls/dired) | 4 | ||||
| -rwxr-xr-x | tests/ls/file-type.sh (renamed from tests/ls/file-type) | 4 | ||||
| -rwxr-xr-x | tests/ls/follow-slink.sh (renamed from tests/ls/follow-slink) | 4 | ||||
| -rwxr-xr-x | tests/ls/getxattr-speedup.sh (renamed from tests/ls/getxattr-speedup) | 4 | ||||
| -rwxr-xr-x | tests/ls/infloop.sh (renamed from tests/ls/infloop) | 4 | ||||
| -rwxr-xr-x | tests/ls/inode.sh (renamed from tests/ls/inode) | 4 | ||||
| -rwxr-xr-x | tests/ls/m-option.sh (renamed from tests/ls/m-option) | 4 | ||||
| -rwxr-xr-x | tests/ls/multihardlink.sh (renamed from tests/ls/multihardlink) | 4 | ||||
| -rwxr-xr-x | tests/ls/nameless-uid.sh (renamed from tests/ls/nameless-uid) | 4 | ||||
| -rwxr-xr-x | tests/ls/no-arg.sh (renamed from tests/ls/no-arg) | 4 | ||||
| -rwxr-xr-x | tests/ls/no-cap.sh (renamed from tests/ls/no-cap) | 4 | ||||
| -rwxr-xr-x | tests/ls/proc-selinux-segfault.sh (renamed from tests/ls/proc-selinux-segfault) | 4 | ||||
| -rwxr-xr-x | tests/ls/readdir-mountpoint-inode.sh (renamed from tests/ls/readdir-mountpoint-inode) | 4 | ||||
| -rwxr-xr-x | tests/ls/recursive.sh (renamed from tests/ls/recursive) | 4 | ||||
| -rwxr-xr-x | tests/ls/root-rel-symlink-color.sh | 51 | ||||
| -rwxr-xr-x | tests/ls/rt-1.sh (renamed from tests/ls/rt-1) | 4 | ||||
| -rwxr-xr-x | tests/ls/slink-acl.sh (renamed from tests/ls/slink-acl) | 4 | ||||
| -rwxr-xr-x | tests/ls/stat-dtype.sh (renamed from tests/ls/stat-dtype) | 4 | ||||
| -rwxr-xr-x | tests/ls/stat-failed.sh (renamed from tests/ls/stat-failed) | 4 | ||||
| -rwxr-xr-x | tests/ls/stat-free-color.sh (renamed from tests/ls/stat-free-color) | 4 | ||||
| -rwxr-xr-x | tests/ls/stat-free-symlinks.sh (renamed from tests/ls/stat-free-symlinks) | 4 | ||||
| -rwxr-xr-x | tests/ls/stat-vs-dirent.sh (renamed from tests/ls/stat-vs-dirent) | 4 | ||||
| -rwxr-xr-x | tests/ls/symlink-slash.sh (renamed from tests/ls/symlink-slash) | 4 | ||||
| -rwxr-xr-x | tests/ls/time-style-diag.sh (renamed from tests/ls/time-style-diag) | 4 | ||||
| -rwxr-xr-x | tests/ls/x-option.sh (renamed from tests/ls/x-option) | 4 |
32 files changed, 113 insertions, 62 deletions
diff --git a/tests/ls/abmon-align b/tests/ls/abmon-align.sh index 4285d075..4c7dc296 100755 --- a/tests/ls/abmon-align +++ b/tests/ls/abmon-align.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure ls output is aligned when using abbreviated months from the locale -# Copyright (C) 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls for mon in $(seq -w 12); do diff --git a/tests/ls/block-size b/tests/ls/block-size.sh index 99750201..2ae5a0c5 100755 --- a/tests/ls/block-size +++ b/tests/ls/block-size.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise ls --block-size and related options. -# Copyright (C) 2011-2012 Free Software Foundation, Inc. +# Copyright (C) 2011-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls TZ=UTC0 diff --git a/tests/ls/capability b/tests/ls/capability.sh index d5d5ee04..6b41a39f 100755 --- a/tests/ls/capability +++ b/tests/ls/capability.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure "ls --color" properly colorizes file with capability. -# Copyright (C) 2008-2012 Free Software Foundation, Inc. +# Copyright (C) 2008-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls require_root_ diff --git a/tests/ls/color-clear-to-eol b/tests/ls/color-clear-to-eol.sh index 5dc6d16b..3d393f47 100755 --- a/tests/ls/color-clear-to-eol +++ b/tests/ls/color-clear-to-eol.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that ls --color works well when a colored name is wrapped -# Copyright (C) 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls long_name=zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz.foo diff --git a/tests/ls/color-dtype-dir b/tests/ls/color-dtype-dir.sh index 69dffd79..fc96e21f 100755 --- a/tests/ls/color-dtype-dir +++ b/tests/ls/color-dtype-dir.sh @@ -4,7 +4,7 @@ # directories the same as the first one -- but only on a file system # with dirent.d_type support. -# Copyright (C) 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 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 @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls # Don't let a different umask perturb the results. diff --git a/tests/ls/color-norm b/tests/ls/color-norm.sh index 28366fb5..9910903b 100755 --- a/tests/ls/color-norm +++ b/tests/ls/color-norm.sh @@ -3,7 +3,7 @@ # I.E. that it uses NORMAL to style non file name output and # file names with no associated color (unless FILE is also set). -# Copyright (C) 2010-2012 Free Software Foundation, Inc. +# Copyright (C) 2010-2013 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 @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls # Don't let a different umask perturb the results. diff --git a/tests/ls/dangle b/tests/ls/dangle.sh index dbc24476..e22519d9 100755 --- a/tests/ls/dangle +++ b/tests/ls/dangle.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure ls properly handles dangling symlinks vs. ls's -L, -H, options. -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls ln -s no-such-file dangle || framework_failure_ diff --git a/tests/ls/dired b/tests/ls/dired.sh index 6b55f435..82110034 100755 --- a/tests/ls/dired +++ b/tests/ls/dired.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure --dired option works -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls mkdir dir || framework_failure_ diff --git a/tests/ls/file-type b/tests/ls/file-type.sh index 3bb7937a..62a7dcf7 100755 --- a/tests/ls/file-type +++ b/tests/ls/file-type.sh @@ -1,7 +1,7 @@ #!/bin/sh # contrast ls -F, ls -p, and ls --indicator-style=file-type -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls mkdir sub diff --git a/tests/ls/follow-slink b/tests/ls/follow-slink.sh index d3c0d6ef..e099b602 100755 --- a/tests/ls/follow-slink +++ b/tests/ls/follow-slink.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure ls -L always follows symlinks -# Copyright (C) 2000-2012 Free Software Foundation, Inc. +# Copyright (C) 2000-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls # Isolate output files from directory being listed diff --git a/tests/ls/getxattr-speedup b/tests/ls/getxattr-speedup.sh index 967f7c95..224362f0 100755 --- a/tests/ls/getxattr-speedup +++ b/tests/ls/getxattr-speedup.sh @@ -4,7 +4,7 @@ # This test is skipped on systems that lack LD_PRELOAD support; that's fine. # Similarly, on a system that lacks getxattr altogether, skipping it is fine. -# Copyright (C) 2012 Free Software Foundation, Inc. +# Copyright (C) 2012-2013 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 @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls # Replace each getxattr and lgetxattr call with a call to these stubs. diff --git a/tests/ls/infloop b/tests/ls/infloop.sh index 9652112c..a441ec2c 100755 --- a/tests/ls/infloop +++ b/tests/ls/infloop.sh @@ -2,7 +2,7 @@ # show that the following no longer makes ls infloop # mkdir loop; cd loop; ln -s ../loop sub; ls -RL # Also ensure ls exits with status = 2 in that case. -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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 @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls mkdir loop || framework_failure_ diff --git a/tests/ls/inode b/tests/ls/inode.sh index 8bf5ba15..8d4bc79d 100755 --- a/tests/ls/inode +++ b/tests/ls/inode.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure that ls -i works properly on symlinks. -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls touch f || framework_failure_ diff --git a/tests/ls/m-option b/tests/ls/m-option.sh index cc72e73c..a66df9a9 100755 --- a/tests/ls/m-option +++ b/tests/ls/m-option.sh @@ -1,7 +1,7 @@ #!/bin/sh # exercise the -m option -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls seq 2000 > b || framework_failure_ diff --git a/tests/ls/multihardlink b/tests/ls/multihardlink.sh index 68a58725..a7344444 100755 --- a/tests/ls/multihardlink +++ b/tests/ls/multihardlink.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure "ls --color" properly colorizes hard linked files. -# Copyright (C) 2008-2012 Free Software Foundation, Inc. +# Copyright (C) 2008-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls working_umask_or_skip_ diff --git a/tests/ls/nameless-uid b/tests/ls/nameless-uid.sh index 5b45b091..a7b9417c 100755 --- a/tests/ls/nameless-uid +++ b/tests/ls/nameless-uid.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that ls -l works on files with nameless uid and/or gid -# Copyright (C) 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls require_root_ diff --git a/tests/ls/no-arg b/tests/ls/no-arg.sh index 8e7d1d61..a89780e0 100755 --- a/tests/ls/no-arg +++ b/tests/ls/no-arg.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure ls and 'ls -R' do the right thing when invoked with no arguments. -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls mkdir -p dir/subdir || framework_failure_ diff --git a/tests/ls/no-cap b/tests/ls/no-cap.sh index 5e1e7887..283f4f42 100755 --- a/tests/ls/no-cap +++ b/tests/ls/no-cap.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that an empty "ca=" attribute disables ls's capability-checking -# Copyright (C) 2008-2012 Free Software Foundation, Inc. +# Copyright (C) 2008-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls require_strace_ capget diff --git a/tests/ls/proc-selinux-segfault b/tests/ls/proc-selinux-segfault.sh index da17ec4f..65790911 100755 --- a/tests/ls/proc-selinux-segfault +++ b/tests/ls/proc-selinux-segfault.sh @@ -1,7 +1,7 @@ #!/bin/sh # ls -l /proc/sys would segfault when built against libselinux1 2.0.15-2+b1 -# Copyright (C) 2008-2012 Free Software Foundation, Inc. +# Copyright (C) 2008-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls f=/proc/sys diff --git a/tests/ls/readdir-mountpoint-inode b/tests/ls/readdir-mountpoint-inode.sh index d46208ba..07839713 100755 --- a/tests/ls/readdir-mountpoint-inode +++ b/tests/ls/readdir-mountpoint-inode.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that ls -i works also for mount points -# Copyright (C) 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls # We use --local here so as to not activate diff --git a/tests/ls/recursive b/tests/ls/recursive.sh index 79fdc7f3..94a414a2 100755 --- a/tests/ls/recursive +++ b/tests/ls/recursive.sh @@ -2,7 +2,7 @@ # 4.1.1 and 4.1.2 had a bug whereby some recursive listings # didn't include a blank line between per-directory groups of files. -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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 @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls mkdir x y a b c a/1 a/2 a/3 || framework_failure_ diff --git a/tests/ls/root-rel-symlink-color.sh b/tests/ls/root-rel-symlink-color.sh new file mode 100755 index 00000000..d90148da --- /dev/null +++ b/tests/ls/root-rel-symlink-color.sh @@ -0,0 +1,51 @@ +#!/bin/sh +# Exercise the 8.17 ls bug with coloring relative-named symlinks in "/". + +# Copyright (C) 2012-2013 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 <http://www.gnu.org/licenses/>. + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +symlink_to_rel= +for i in /*; do + # Skip non-symlinks: + env test -h "$i" || continue + + # Skip dangling symlinks: + env test -e "$i" || continue + + # Skip any symlink-to-absolute-name: + case $(readlink "$i") in /*) continue ;; esac + + symlink_to_rel=$i + break +done + +test -z "$symlink_to_rel" \ + && skip_ no relative symlink in / + +e='\33' +color_code='01;36' +c_pre="$e[0m$e[${color_code}m" +c_post="$e[0m" +printf "$c_pre$symlink_to_rel$c_post\n" > exp || framework_failure_ + +env TERM=xterm LS_COLORS="ln=$color_code:or=1;31;42" \ + ls -d --color=always "$symlink_to_rel" > out || fail=1 + +compare exp out || fail=1 + +Exit $fail diff --git a/tests/ls/rt-1 b/tests/ls/rt-1.sh index f7d78df6..50ad1fd2 100755 --- a/tests/ls/rt-1 +++ b/tests/ls/rt-1.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure name is used as secondary key when sorting on mtime or ctime. -# Copyright (C) 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1998-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls touch date=1998-01-15 diff --git a/tests/ls/slink-acl b/tests/ls/slink-acl.sh index ae9af503..e02478a4 100755 --- a/tests/ls/slink-acl +++ b/tests/ls/slink-acl.sh @@ -1,7 +1,7 @@ #!/bin/sh # verify that ls -lL works when applied to a symlink to an ACL'd file -# Copyright (C) 2011-2012 Free Software Foundation, Inc. +# Copyright (C) 2011-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls require_setfacl_ diff --git a/tests/ls/stat-dtype b/tests/ls/stat-dtype.sh index b84d5d51..8bfc69d1 100755 --- a/tests/ls/stat-dtype +++ b/tests/ls/stat-dtype.sh @@ -3,7 +3,7 @@ # Also check for the dtype-related (and fs-type dependent) bug # in coreutils-6.0 that made ls -CF columns misaligned. -# Copyright (C) 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 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 @@ -21,7 +21,7 @@ # The trick is to create an un-stat'able symlink and to see if ls # can report its type nonetheless, using dirent.d_type. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls # Skip this test unless "." is on a file system with useful d_type info. diff --git a/tests/ls/stat-failed b/tests/ls/stat-failed.sh index 464406bd..cdd7a4e9 100755 --- a/tests/ls/stat-failed +++ b/tests/ls/stat-failed.sh @@ -2,7 +2,7 @@ # Verify that ls works properly when it fails to stat a file that is # not mentioned on the command line. -# Copyright (C) 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 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 @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls skip_if_root_ diff --git a/tests/ls/stat-free-color b/tests/ls/stat-free-color.sh index daff2eb5..3aacf961 100755 --- a/tests/ls/stat-free-color +++ b/tests/ls/stat-free-color.sh @@ -1,7 +1,7 @@ #!/bin/sh # Show that --color need not use stat, as long as we have d_type support. -# Copyright (C) 2011-2012 Free Software Foundation, Inc. +# Copyright (C) 2011-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls require_strace_ stat require_dirent_d_type_ diff --git a/tests/ls/stat-free-symlinks b/tests/ls/stat-free-symlinks.sh index 8e04e2e8..33cd16a8 100755 --- a/tests/ls/stat-free-symlinks +++ b/tests/ls/stat-free-symlinks.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that ls does not stat a symlink in an unusual case -# Copyright (C) 2007-2012 Free Software Foundation, Inc. +# Copyright (C) 2007-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls require_strace_ stat diff --git a/tests/ls/stat-vs-dirent b/tests/ls/stat-vs-dirent.sh index 1dd6e662..b54f5503 100755 --- a/tests/ls/stat-vs-dirent +++ b/tests/ls/stat-vs-dirent.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that d_ino (from ls -di) and st_ino (from stat --format=%i) match. -# Copyright (C) 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls diff --git a/tests/ls/symlink-slash b/tests/ls/symlink-slash.sh index 28c7d32b..5e64a52b 100755 --- a/tests/ls/symlink-slash +++ b/tests/ls/symlink-slash.sh @@ -1,7 +1,7 @@ #!/bin/sh # Do dereference a symlink arg if its name is written with a trailing slash. -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls mkdir dir || framework_failure_ diff --git a/tests/ls/time-style-diag b/tests/ls/time-style-diag.sh index ae41c936..e9d32989 100755 --- a/tests/ls/time-style-diag +++ b/tests/ls/time-style-diag.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that an invalid --time-style=ARG is diagnosed the way we want. -# Copyright (C) 2011-2012 Free Software Foundation, Inc. +# Copyright (C) 2011-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls ls -l --time-style=XX > out 2> err diff --git a/tests/ls/x-option b/tests/ls/x-option.sh index 38faa72b..f1bc69d9 100755 --- a/tests/ls/x-option +++ b/tests/ls/x-option.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise the -x option. -# Copyright (C) 2007-2012 Free Software Foundation, Inc. +# Copyright (C) 2007-2013 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 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls mkdir subdir || framework_failure_ |