tests: port to Solaris diff

[chaz/tar] / tests / ignfail.at

diff --git a/tests/ignfail.at b/tests/ignfail.at
index bab88f3ee385c17e55625946dc8b8e9a9dc85248..03f90450b5c2fd12c8548df9999dc1583e36373c 100644 (file)
--- 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,
@@ -15,8 +15,8 @@
 
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # Unreadable directories yielded error despite --ignore-failed-read.
 
@@ -24,56 +24,54 @@ 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 savedir: Permission denied
-tar: Error exit delayed from previous errors
+tar: directory: Cannot open: Permission denied
+tar: Exiting with failure status due to previous errors
 -----
-tar: directory: Warning: Cannot savedir: Permission denied
+tar: directory: Warning: Cannot open: Permission denied
 ])
 
 AT_CLEANUP