Rewritten testsuite in autotest

[chaz/tar] / tests / listed02.at

diff --git a/tests/listed02.sh b/tests/listed02.at
old mode 100755 (executable)
new mode 100644 (file)
similarity index 80%
rename from tests/listed02.sh
rename to tests/listed02.at
index 9345c16..78730dd
--- a/tests/listed02.sh
+++ b/tests/listed02.at
@@ -1,17 +1,18 @@
-#! /bin/sh
-# This file is part of GNU tar testsuite.
+# Process this file with autom4te to create testsuite. -*- Autotest -*-
+
+# Test suite for GNU tar.
 # Copyright (C) 2004 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)
 # any later version.
-#
+
 # This program 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
@@ -24,10 +25,10 @@
 #  <20040626230315.163AA1D148@cpc5-cmbg1-6-0-cust208.cmbg.cable.ntl.com>
 #  http://lists.gnu.org/archive/html/bug-tar/2004-06/msg00028.html
 
-. ./preset
-TAR_ARCHIVE_FORMATS="gnu oldgnu" 
-. $srcdir/before
+AT_SETUP([working --listed])
+AT_KEYWORDS([listed02])
 
+AT_TAR_CHECK([
 mkdir directory
 
 echo Create directories
@@ -46,7 +47,7 @@ done
 
 sleep 1
 echo Creating main archive
-tar -c -v --listed-incremental=tart.incr1 -f archive.1 tart
+tar -c -v --listed-incremental=tart.incr1 -f archive.1 tart || exit 1
 
 sleep 1
 echo Modifying filesystem
@@ -61,28 +62,24 @@ find tart|sort
 sleep 1
 echo Creating incremental archive
 cp -p tart.incr1 tart.incr2
-tar -c -v --listed-incremental=tart.incr2 -f archive.2 tart
+tar -c -v --listed-incremental=tart.incr2 -f archive.2 tart || exit 1 
 
 sleep 1
 
 rm -rf tart/*
 echo Extracting main archive
-tar -x -v --listed-incremental=tart.incr1 -f archive.1
+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 
 
 echo Final files:
 find tart|sort
-
-err="tar: tart/c0: Directory is new
-tar: tart/c1: Directory is new
-tar: tart/c2: Directory is new
-"
-
-out="Create directories
+],
+[0],
+[Create directories
 Creating main archive
 tart/
 tart/c0/
@@ -123,9 +120,9 @@ 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'
+tar: Deleting `tart/c1'
 tart/
 tart/b2
 tart/c0/
@@ -143,6 +140,11 @@ tart/c2
 tart/c2/ca1
 tart/c2/ca2
 tart/c2/ca3
-"
+],
+[tar: tart/c0: Directory is new
+tar: tart/c1: Directory is new
+tar: tart/c2: Directory is new
+],
+[],[],[gnu, oldgnu])
 
-. $srcdir/after
+AT_CLEANUP