X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tests%2Flisted02.at;h=5040c0806af09fc1f2c8b0567708692219fe5c24;hb=e8a4c35a7396441bd538a70c7f47727d8f920da8;hp=4358061826d46d55cc4725976dc07dedb9aadad1;hpb=120e96c480fbfc5fa31fba0f59ba1a45953b838e;p=chaz%2Ftar

diff --git a/tests/listed02.at b/tests/listed02.at
index 4358061..5040c08 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
@@ -26,11 +26,12 @@
 #  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([
-
+AT_SORT_PREREQ
 echo Create directories
+
 mkdir tart
 sleep 1
 mkdir tart/c0
@@ -46,21 +47,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; 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
 
@@ -114,8 +111,6 @@ tart/
 tart/c0/
 tart/c2/
 tart/b2
-tart/c2/ca1
-tart/c2/ca2
 tart/c2/ca3
 Extracting main archive
 tart/
@@ -130,13 +125,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
@@ -151,7 +143,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])