Sort the two lines of stderr from the

[chaz/tar] / tests / listed02.at

diff --git a/tests/listed02.at b/tests/listed02.at
index 2cf850c9a46d4dcc90bbee47e872afad4461d71e..382e503a67acab64fb6d8fe5e04e375b0294fa20 100644 (file)
--- 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,7 +26,7 @@
 #  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([
 
@@ -46,21 +46,17 @@ 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
 
-# Current incremental backup algorithm is not able to cope with
-# renamed files on filesystems that do not change ctime when
-# renaming. So, if we're on such filesystem, we skip this test.
-CTIME=`genfile --stat=ctime tart/b1`
 mv tart/b1 tart/b2
-if test $CTIME -eq `genfile --stat=ctime tart/b2`; then
-  AT_SKIP_TEST
-fi
-# 
 mv tart/c1 tart/c2
 touch tart/c2/ca3