X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tests%2Fignfail.at;h=fec64d96f81cc6d3bfb4df091bbb340cf1b35803;hb=ec94fbdf458adb2af803eefdd1a9c9bbb432bb21;hp=6a57316a99a91ff050847911323ac765777e242e;hpb=aa976a517088ba75fa0168b47803b3988f89c9c3;p=chaz%2Ftar

diff --git a/tests/ignfail.at b/tests/ignfail.at
index 6a57316..fec64d9 100644
--- a/tests/ignfail.at
+++ b/tests/ignfail.at
@@ -1,22 +1,22 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
+# This file is part of GNU tar.
+
+# GNU tar 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 2, or (at your option)
-# any later version.
+# 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,
+# GNU tar 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Unreadable directories yielded error despite --ignore-failed-read.
 
@@ -24,54 +24,52 @@ AT_SETUP([ignfail])
 AT_KEYWORDS([ignfail])
 
 AT_TAR_CHECK([
-if test -w / ; then
-	# The test is meaningless for super-user.
-	AT_SKIP_TEST
-else
-	touch file
-	mkdir directory
-	touch directory/file
+# The test is meaningless for super-user.
+AT_UNPRIVILEGED_PREREQ
+
+touch file
+mkdir directory
+touch directory/file
 
-	echo 1>&2 -----
-	chmod 000 file
-	tar cf archive file
-	status=$?
-	chmod 600 file
-	test $status = 2 || exit 1
+echo 1>&2 -----
+chmod 000 file
+tar cf archive file
+status=$?
+chmod 600 file
+test $status = 2 || exit 1
 
-	echo 1>&2 -----
-	chmod 000 file
-	tar cf archive --ignore-failed-read file || exit 1
-	status=$?
-	chmod 600 file
-	test $status = 0 || exit 1
+echo 1>&2 -----
+chmod 000 file
+tar cf archive --ignore-failed-read file || exit 1
+status=$?
+chmod 600 file
+test $status = 0 || exit 1
 
-	echo 1>&2 -----
-	chmod 000 directory
-	tar cf archive directory
-	status=$?
-	chmod 700 directory
-	test $status = 2 || exit 1
+echo 1>&2 -----
+chmod 000 directory
+tar cf archive directory
+status=$?
+chmod 700 directory
+test $status = 2 || exit 1
 
-	echo 1>&2 -----
-	chmod 000 directory
-	tar cf archive --ignore-failed-read directory || exit 1
-	status=$?
-	chmod 700 directory
-	test $status = 0
-fi
+echo 1>&2 -----
+chmod 000 directory
+tar cf archive --ignore-failed-read directory || exit 1
+status=$?
+chmod 700 directory
+test $status = 0
 ],
 [0],
 [],
 [
 -----
 tar: file: Cannot open: Permission denied
-tar: Error exit delayed from previous errors
+tar: Exiting with failure status due to previous errors
 -----
 tar: file: Warning: Cannot open: Permission denied
 -----
 tar: directory: Cannot open: Permission denied
-tar: Error exit delayed from previous errors
+tar: Exiting with failure status due to previous errors
 -----
 tar: directory: Warning: Cannot open: Permission denied
 ])