X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tests%2Flisted02.at;h=272d843b589e8786cb1d4346ceadf863bcb96d69;hb=738fb9c2f44eee567bb60e22dc011bdfd2f362a8;hp=78730dd1ee296ec667f284caf7c43774f10bd341;hpb=35cae74c4cae8e59c84e215c493e5a032dbe4e15;p=chaz%2Ftar
diff --git a/tests/listed02.at b/tests/listed02.at
index 78730dd..272d843 100644
--- a/tests/listed02.at
+++ b/tests/listed02.at
@@ -1,37 +1,37 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright 2004-2007, 2009, 2013 Free Software Foundation, Inc.
-# This program is free software; you can redistribute it and/or modify
+# This file is part of GNU tar.
+
+# GNU tar 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)
-# any later version.
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
-# This program is distributed in the hope that it will be useful,
+# GNU tar is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# 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.
+# along with this program. If not, see .
# Check if listed-incremental backups work for files moved from one directory
-# to another.
+# to another.
# Based on a script by Martin Simmons
-# References:
+# References:
# <20040626230315.163AA1D148@cpc5-cmbg1-6-0-cust208.cmbg.cable.ntl.com>
# 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
-
+AT_SORT_PREREQ
echo Create directories
+
mkdir tart
sleep 1
mkdir tart/c0
@@ -47,36 +47,44 @@ done
sleep 1
echo Creating main archive
-tar -c -v --listed-incremental=tart.incr1 -f archive.1 tart || exit 1
+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; 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
+echo >&2 "Creating incremental archive"
cp -p tart.incr1 tart.incr2
-tar -c -v --listed-incremental=tart.incr2 -f archive.2 tart || exit 1
+tar -c -v --listed-incremental=tart.incr2 -f archive.2 tart || exit 1
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
# 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 +114,6 @@ tart/
tart/c0/
tart/c2/
tart/b2
-tart/c2/ca1
-tart/c2/ca2
tart/c2/ca3
Extracting main archive
tart/
@@ -120,15 +126,12 @@ tart/c0/cq2
tart/c1/ca1
tart/c1/ca2
Extracting incremental archive
-tar: Deleting `tart/a1'
-tar: Deleting `tart/b1'
-tar: Deleting `tart/c1'
+tar: Deleting 'tart/a1'
+tar: Deleting 'tart/b1'
tart/
tart/b2
tart/c0/
tart/c2/
-tart/c2/ca1
-tart/c2/ca2
tart/c2/ca3
Final files:
tart
@@ -141,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])