Improve listed incremental dumps.

[chaz/tar] / tests / listed02.at

diff --git a/tests/listed02.at b/tests/listed02.at
index 382e503a67acab64fb6d8fe5e04e375b0294fa20..2f1f0704eef979496f3b15c3932a8567b0363a24 100644 (file)
--- a/tests/listed02.at
+++ b/tests/listed02.at
@@ -1,11 +1,11 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006, 2007, 2009 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,
@@ -29,8 +29,9 @@ AT_SETUP([working --listed])
 AT_KEYWORDS([listed incremental listed02])
 
 AT_TAR_CHECK([
-
+AT_SORT_PREREQ
 echo Create directories
+
 mkdir tart
 sleep 1
 mkdir tart/c0
@@ -46,11 +47,12 @@ done
 
 sleep 1
 echo Creating main archive
+echo >&2 "Creating main archive"
 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
+sort err 1>&2; rm -f err
 
 sleep 1
 echo Modifying filesystem
@@ -65,6 +67,7 @@ find tart -print | sort 2>/dev/null
 
 sleep 1
 echo Creating incremental archive
+echo >&2 "Creating incremental archive"
 cp -p tart.incr1 tart.incr2
 tar -c -v --listed-incremental=tart.incr2 -f archive.2 tart || exit 1 
 
@@ -72,6 +75,7 @@ sleep 1
 
 rm -rf tart/*
 echo Extracting main archive
+echo >&2 "Extracting main archive"
 tar -x -v --listed-incremental=tart.incr1 -f archive.1 || exit 1
 echo Extracting incremental archive
 # This command should produce three messages about deletion
@@ -110,8 +114,6 @@ tart/
 tart/c0/
 tart/c2/
 tart/b2
-tart/c2/ca1
-tart/c2/ca2
 tart/c2/ca3
 Extracting main archive
 tart/
@@ -126,13 +128,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
@@ -145,9 +144,13 @@ tart/c2/ca1
 tart/c2/ca2
 tart/c2/ca3
 ],
-[tar: tart/c0: Directory is new
+[Creating main archive
+tar: tart/c0: Directory is new
 tar: tart/c1: Directory is new
-tar: tart/c2: Directory is new
+tar: tart: Directory is new
+Creating incremental archive
+tar: tart/c2: Directory has been renamed from `tart/c1'
+Extracting main archive
 ],
 [],[],[gnu, oldgnu])