X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tests%2Flisted02.at;h=d1c773fff23c9879b97094db69a45e9f1594ca20;hb=edd6df370de5a894d42f99c629c2a0ef8b235646;hp=78730dd1ee296ec667f284caf7c43774f10bd341;hpb=35cae74c4cae8e59c84e215c493e5a032dbe4e15;p=chaz%2Ftar

diff --git a/tests/listed02.at b/tests/listed02.at
index 78730dd..d1c773f 100644
--- a/tests/listed02.at
+++ b/tests/listed02.at
@@ -1,7 +1,7 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006 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
@@ -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.
 
 # Check if listed-incremental backups work for files moved from one directory
 # to another. 
@@ -26,10 +26,9 @@
 #  http://lists.gnu.org/archive/html/bug-tar/2004-06/msg00028.html
 
 AT_SETUP([working --listed])
-AT_KEYWORDS([listed02])
+AT_KEYWORDS([listed incremental listed02])
 
 AT_TAR_CHECK([
-mkdir directory
 
 echo Create directories
 mkdir tart
@@ -47,17 +46,22 @@ done
 
 sleep 1
 echo Creating main archive
-tar -c -v --listed-incremental=tart.incr1 -f archive.1 tart || exit 1
+tar -c -v --listed-incremental=tart.incr1 -f archive.1 tart 2> err || exit 1
+
+# The above prints two lines to stderr announcing the new directories c0 and c1.
+# Ensure that they appear in this script's stderr in sorted order.
+sort err 1>&2 2>/dev/null; rm -f err
 
 sleep 1
 echo Modifying filesystem
 rm tart/a1
+
 mv tart/b1 tart/b2
 mv tart/c1 tart/c2
 touch tart/c2/ca3
 
 echo Directory contents
-find tart|sort
+find tart -print | sort 2>/dev/null
 
 sleep 1
 echo Creating incremental archive
@@ -73,10 +77,10 @@ echo Extracting incremental archive
 # This command should produce three messages about deletion
 # of the existing files, that may appear in any order. Piping
 # to sort makes sure we don't depend on any particular ordering.
-tar -x -v --listed-incremental=tart.incr2 -f archive.2 | sort 
+tar -x -v --listed-incremental=tart.incr2 -f archive.2 | sort 2>/dev/null 
 
 echo Final files:
-find tart|sort
+find tart -print | sort 2>/dev/null
 ],
 [0],
 [Create directories
@@ -106,8 +110,6 @@ tart/
 tart/c0/
 tart/c2/
 tart/b2
-tart/c2/ca1
-tart/c2/ca2
 tart/c2/ca3
 Extracting main archive
 tart/
@@ -122,13 +124,10 @@ tart/c1/ca2
 Extracting incremental archive
 tar: Deleting `tart/a1'
 tar: Deleting `tart/b1'
-tar: Deleting `tart/c1'
 tart/
 tart/b2
 tart/c0/
 tart/c2/
-tart/c2/ca1
-tart/c2/ca2
 tart/c2/ca3
 Final files:
 tart
@@ -143,7 +142,7 @@ tart/c2/ca3
 ],
 [tar: tart/c0: Directory is new
 tar: tart/c1: Directory is new
-tar: tart/c2: Directory is new
+tar: tart/c2: Directory has been renamed from `tart/c1'
 ],
 [],[],[gnu, oldgnu])