Call AT_SORT_PREREQ. Remove fd 2 redirection after sort invocations

diff --git a/tests/extrac04.at b/tests/extrac04.at
index 22c75821f6146fd26a30f287cad817e4370154a4..1cbc520c86d725dc81063012f0f5928b047376ad 100644 (file)
--- a/tests/extrac04.at
+++ b/tests/extrac04.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, 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
@@ -24,6 +24,7 @@ AT_SETUP([extract + fnmatch])
 AT_KEYWORDS([extract extract04])
 
 AT_TAR_CHECK([
+AT_SORT_PREREQ
 touch file1
 mkdir directory
 mkdir directory/subdirectory
@@ -35,7 +36,7 @@ tar -cf archive ./file1 directory
 tar -tf archive \
   --exclude='./*1' \
   --exclude='d*/*1' \
-  --exclude='d*/s*/*2' | sort 2>/dev/null
+  --exclude='d*/s*/*2' | sort 
 ],
 [0],
 [directory/

diff --git a/tests/incr03.at b/tests/incr03.at
index 0d5b835abf65ec8690530d5da6a9e0dc9d7fbbf6..474ae7f2f184e2197522ea6d554e429724d5387c 100644 (file)
--- a/tests/incr03.at
+++ b/tests/incr03.at
@@ -29,6 +29,7 @@ AT_SETUP([renamed files in incrementals])
 AT_KEYWORDS([incremental incr03 rename])
 
 AT_TAR_CHECK([
+AT_SORT_PREREQ
 mkdir directory
 genfile --file=directory/x
 genfile --file=directory/y
@@ -41,17 +42,17 @@ tar -cf archive.2 -g db directory
 mv directory orig
 
 echo Listing of archive.1
-tar -tf archive.1 | sort 2>/dev/null
+tar -tf archive.1 | sort 
 echo Listing of archive.2
-tar -tf archive.2 | sort 2>/dev/null
+tar -tf archive.2 | sort 
 
 echo Directory after first restore
 tar -xf archive.1 -g db
-find directory | sort 2>/dev/null
+find directory | sort
 
 echo Directory after second restore
 tar -xf archive.2 -g db
-find directory | sort 2>/dev/null
+find directory | sort 
 ],
 [0],
 [Listing of archive.1

diff --git a/tests/listed02.at b/tests/listed02.at
index d1c773fff23c9879b97094db69a45e9f1594ca20..5040c0806af09fc1f2c8b0567708692219fe5c24 100644 (file)
--- a/tests/listed02.at
+++ b/tests/listed02.at
@@ -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
@@ -50,7 +51,7 @@ 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

diff --git a/tests/pipe.at b/tests/pipe.at
index 07e4d8d45abfb6a45612e70bb099f92bf7347ba5..c557b29a1e0bc3016af9b657986b23f40887f7e6 100644 (file)
--- a/tests/pipe.at
+++ b/tests/pipe.at
@@ -31,12 +31,14 @@ AT_SETUP([decompressing from stdin])
 AT_KEYWORDS([pipe])
 
 AT_TAR_CHECK([
+AT_SORT_PREREQ
+
 mkdir directory
 genfile --length 10240 --pattern zeros --file directory/file1
 genfile --length 13 --file directory/file2
-tar cf archive directory|sort 2>/dev/null
+tar cf archive directory|sort 
 mv directory orig
-cat archive | tar xfv - | sort 2>/dev/null
+cat archive | tar xfv - | sort 
 echo "separator"
 cmp orig/file1 directory/file1
 echo "separator"

diff --git a/tests/rename01.at b/tests/rename01.at
index c992da816ae520566ae5acbde4d5228ac75f6f8f..52e139b68b23b5c1225111c155b513c050613c66 100644 (file)
--- a/tests/rename01.at
+++ b/tests/rename01.at
@@ -25,6 +25,8 @@ AT_SETUP([renamed dirs in incrementals])
 AT_KEYWORDS([incremental rename rename01])
 
 AT_TAR_CHECK([
+AT_SORT_PREREQ
+
 mkdir foo
 genfile --file foo/file1
 genfile --file foo/file2

diff --git a/tests/rename02.at b/tests/rename02.at
index 8fffe7364f9092a3d59bd24251b870524e6e311e..c62385148c53cb52ea039c2e2be7f74af549d0fd 100644 (file)
--- a/tests/rename02.at
+++ b/tests/rename02.at
@@ -25,6 +25,7 @@ AT_SETUP([move between hierarchies])
 AT_KEYWORDS([incremental rename rename02])
 
 AT_TAR_CHECK([
+AT_SORT_PREREQ
 mkdir foo
 genfile --file foo/file1
 genfile --file foo/file2

diff --git a/tests/rename03.at b/tests/rename03.at
index 83b0c182b8e5808a76fc0e57a40003ee9d4c2405..138ef004c6afc23010b74cbee89d6ae8c6c8375e 100644 (file)
--- a/tests/rename03.at
+++ b/tests/rename03.at
@@ -24,6 +24,8 @@ AT_SETUP([cyclic renames])
 AT_KEYWORDS([incremental rename rename03 cyclic-rename])
 
 AT_TAR_CHECK([
+AT_SORT_PREREQ
+
 mkdir foo
 genfile --file foo/file1
 genfile --file foo/file2

diff --git a/tests/same-order01.at b/tests/same-order01.at
index e06595347259b786965ac64b881bb3170dadbe61..e04c812db21d404de94cb85f05e483a288aa2e15 100644 (file)
--- a/tests/same-order01.at
+++ b/tests/same-order01.at
@@ -27,6 +27,8 @@ AT_SETUP([same-order01])
 AT_KEYWORDS([same-order same-order01])
 
 AT_TAR_CHECK([
+AT_SORT_PREREQ
+
 genfile -l 1024 -f file1
 genfile -l 1024 -f file2
 tar cf archive file1 file2
@@ -34,7 +36,7 @@ tar cf archive file1 file2
 mkdir directory
 tar -xf archive --same-order -C directory || exit 1
 
-ls directory|sort 2>/dev/null
+ls directory|sort 
 ],
 [0],
 [file1

diff --git a/tests/update.at b/tests/update.at
index 067c6348e918da6d7109a1774b2f8ea87fe34e48..30fc2dcff147af5c8d0f8243a8266742160d60b4 100644 (file)
--- a/tests/update.at
+++ b/tests/update.at
@@ -1,7 +1,7 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -28,6 +28,7 @@ AT_SETUP([update unchanged directories])
 AT_KEYWORDS([update])
 
 AT_TAR_CHECK([
+AT_SORT_PREREQ
 mkdir directory
 genfile --length 10240 --pattern zeros --file directory/file1
 genfile --length 10240 --pattern default --file directory/file2
@@ -36,7 +37,7 @@ tar cf archive directory || exit 1
 echo separator
 tar uf archive directory || exit 1
 echo separator
-tar tf archive | sort 2>/dev/null || exit 1
+tar tf archive | sort || exit 1
 ],
 [0],
 [separator