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

diff --git a/tests/ignfail.at b/tests/ignfail.at
index 6a57316..03f9045 100644
--- a/tests/ignfail.at
+++ b/tests/ignfail.at
@@ -1,11 +1,11 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2006, 2007 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 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # This program is distributed in the hope that it will be useful,
@@ -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
 
-	echo 1>&2 -----
-	chmod 000 file
-	tar cf archive file
-	status=$?
-	chmod 600 file
-	test $status = 2 || exit 1
+touch file
+mkdir directory
+touch directory/file
 
-	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 file
+status=$?
+chmod 600 file
+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 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 --ignore-failed-read directory || exit 1
-	status=$?
-	chmod 700 directory
-	test $status = 0
-fi
+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
 ],
 [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
 ])