Fix namespace contamination in testsuite.

[chaz/tar] / tests / multiv05.at

diff --git a/tests/multiv05.at b/tests/multiv05.at
index 986056e623b3772d616f9ff20bcec8adface2fd6..33422f4a8cf8b1e1ec44261398db195e8d4cbfa1 100644 (file)
--- a/tests/multiv05.at
+++ b/tests/multiv05.at
@@ -1,31 +1,31 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+# Copyright 2006-2008, 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 3, 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Up to version 1.15.91 tar was unable to recognize all volumes
-# given after an aout-of-sync volume.
+# given after an out-of-sync volume.
 # Reported by: Joerg Weilbier <gnu@weilbier.net>
 # References: <200610011952.29880.gnu@weilbier.net>
 
-AT_SETUP([Restoring after an out of sync folume])
+AT_SETUP([Restoring after an out of sync volume])
 AT_KEYWORDS([multivolume multiv multiv05 sync])
-m4_define([FILELIST],[jeden,dwa,trzy,cztery,piec,szesc])
+m4_pushdef([FILELIST],[jeden,dwa,trzy,cztery,piec,szesc])
 
 AT_TAR_CHECK([
 exec <&-
@@ -40,7 +40,7 @@ tar -c -M -L 502 -f a.tar -f b.tar -f c.tar m4_foreach([f],[FILELIST],f )
 echo separator
 mkdir bak
 mv m4_foreach([f],[FILELIST],f )bak
-tar -vxM -f a.tar -f c.tar -f b.tar -f c.tar 
+tar -vxM -f a.tar -f c.tar -f b.tar -f c.tar
 m4_foreach([f],
   [FILELIST],
   [echo Diffing f
@@ -58,10 +58,8 @@ m4_foreach([file],
   [Diffing file
 ])dnl
 ,
-[tar: `trzy' is not continued on this volume
+[tar: 'trzy' is not continued on this volume
 ],[],[], [gnu])
 
+m4_popdef([FILELIST])
 AT_CLEANUP
-
-
-