| 1 |
dirtyepic 09/02/02 19:00:01 |
| 2 |
|
| 3 |
Added: tar-1.21-testsuite.patch |
| 4 |
Log: |
| 5 |
Add patch from upstream to fix testsuite failures. (bug #253122) |
| 6 |
(Portage version: 2.2_rc23/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-arch/tar/files/tar-1.21-testsuite.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/tar/files/tar-1.21-testsuite.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/tar/files/tar-1.21-testsuite.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: tar-1.21-testsuite.patch |
| 15 |
=================================================================== |
| 16 |
https://bugs.gentoo.org/show_bug.cgi?id=253122 |
| 17 |
http://git.savannah.gnu.org/cgit/tar.git/commit/?id=7b68ef3d918603f3afb03e939ba72f5cad10edf4 |
| 18 |
|
| 19 |
From 7b68ef3d918603f3afb03e939ba72f5cad10edf4 Mon Sep 17 00:00:00 2001 |
| 20 |
From: Sergey Poznyakoff <gray@×××××××.ua> |
| 21 |
Date: Mon, 29 Dec 2008 09:27:00 +0000 |
| 22 |
Subject: Fix testsuite and bootstrap. Implement -I. |
| 23 |
|
| 24 |
* bootstrap.conf: Include size_max. |
| 25 |
* gnulib.modules: Remove memset, rmdir. Replace strdup with |
| 26 |
strdup-posix. Patch by Eric Blake. |
| 27 |
* src/tar.c: Implement -I as a shorthand for --use-compress-program. |
| 28 |
* doc/tar.texi: Document -I. |
| 29 |
* tests/pipe.at, tests/shortrec.at: Account for eventual 'Record |
| 30 |
size' output. |
| 31 |
* tests/testsuite.at (AT_TAR_CHECK_HOOK): New define |
| 32 |
(AT_TAR_WITH_HOOK, TAR_IGNREC_HOOK): New macros. |
| 33 |
--- |
| 34 |
diff --git a/tests/pipe.at b/tests/pipe.at |
| 35 |
index efca65b..be99212 100644 |
| 36 |
--- a/tests/pipe.at |
| 37 |
+++ b/tests/pipe.at |
| 38 |
@@ -1,7 +1,7 @@ |
| 39 |
# Process this file with autom4te to create testsuite. -*- Autotest -*- |
| 40 |
|
| 41 |
# Test suite for GNU tar. |
| 42 |
-# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. |
| 43 |
+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
| 44 |
|
| 45 |
# This program is free software; you can redistribute it and/or modify |
| 46 |
# it under the terms of the GNU General Public License as published by |
| 47 |
@@ -30,7 +30,8 @@ AT_SETUP([decompressing from stdin]) |
| 48 |
|
| 49 |
AT_KEYWORDS([pipe]) |
| 50 |
|
| 51 |
-AT_TAR_CHECK([ |
| 52 |
+AT_TAR_WITH_HOOK([TAR_IGNREC_HOOK], |
| 53 |
+[AT_TAR_CHECK([ |
| 54 |
AT_SORT_PREREQ |
| 55 |
|
| 56 |
mkdir directory |
| 57 |
@@ -49,6 +50,7 @@ directory/file1 |
| 58 |
directory/file2 |
| 59 |
separator |
| 60 |
separator |
| 61 |
-]) |
| 62 |
+], |
| 63 |
+[stderr])]) |
| 64 |
|
| 65 |
AT_CLEANUP |
| 66 |
diff --git a/tests/shortrec.at b/tests/shortrec.at |
| 67 |
index 3e009fd..179f365 100644 |
| 68 |
--- a/tests/shortrec.at |
| 69 |
+++ b/tests/shortrec.at |
| 70 |
@@ -1,7 +1,7 @@ |
| 71 |
# Process this file with autom4te to create testsuite. -*- Autotest -*- |
| 72 |
|
| 73 |
# Test suite for GNU tar. |
| 74 |
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc. |
| 75 |
+# Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc. |
| 76 |
|
| 77 |
# This program is free software; you can redistribute it and/or modify |
| 78 |
# it under the terms of the GNU General Public License as published by |
| 79 |
@@ -23,17 +23,22 @@ |
| 80 |
# used to create the archive. |
| 81 |
|
| 82 |
AT_SETUP([short records]) |
| 83 |
-AT_KEYWORDS([shortrec.at]) |
| 84 |
+AT_KEYWORDS([shortrec]) |
| 85 |
|
| 86 |
-AT_TAR_CHECK([ |
| 87 |
+AT_TAR_WITH_HOOK([TAR_IGNREC_HOOK], |
| 88 |
+[AT_TAR_CHECK([ |
| 89 |
mkdir directory |
| 90 |
(cd directory && touch a b c d e f g h i j k l m n o p q r) |
| 91 |
-tar -c -b 1 -f - directory | tar -t -f - >/dev/null |
| 92 |
+tar -c -b 1 -f - directory | tar -t -f - |
| 93 |
tar -c -b 1 -f archive directory |
| 94 |
-tar -t -f archive >/dev/null |
| 95 |
-tar -t -f - < archive >/dev/null |
| 96 |
+tar -t -f archive |
| 97 |
+tar -t -f - < archive |
| 98 |
|
| 99 |
rm -r directory |
| 100 |
+], |
| 101 |
+[0], |
| 102 |
+[ignore], |
| 103 |
+[stderr]) |
| 104 |
]) |
| 105 |
|
| 106 |
AT_CLEANUP |
| 107 |
diff --git a/tests/testsuite.at b/tests/testsuite.at |
| 108 |
index 2fa5392..a12477d 100644 |
| 109 |
--- a/tests/testsuite.at |
| 110 |
+++ b/tests/testsuite.at |
| 111 |
@@ -1,7 +1,7 @@ |
| 112 |
# Process this file with autom4te to create testsuite. -*- Autotest -*- |
| 113 |
|
| 114 |
# Test suite for GNU tar. |
| 115 |
-# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. |
| 116 |
+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
| 117 |
|
| 118 |
# This program is free software; you can redistribute it and/or modify |
| 119 |
# it under the terms of the GNU General Public License as published by |
| 120 |
@@ -21,6 +21,7 @@ |
| 121 |
# We need a recent Autotest. |
| 122 |
m4_version_prereq([2.52g]) |
| 123 |
|
| 124 |
+m4_define([AT_TAR_CHECK_HOOK]) |
| 125 |
m4_define([AT_TAR_CHECK],[ |
| 126 |
AT_XFAIL_IF(test -f $[]XFAILFILE) |
| 127 |
m4_foreach([FMT], |
| 128 |
@@ -33,9 +34,20 @@ export TEST_TAR_FORMAT |
| 129 |
TAR_OPTIONS="-H FMT" |
| 130 |
export TAR_OPTIONS |
| 131 |
rm -rf * |
| 132 |
-$1)],$2,$3,$4,$5,$6)]) |
| 133 |
+$1)],$2,$3,$4,$5,$6) |
| 134 |
+ AT_TAR_CHECK_HOOK]) |
| 135 |
]) |
| 136 |
|
| 137 |
+m4_define([AT_TAR_WITH_HOOK],[ |
| 138 |
+ m4_pushdef([AT_TAR_CHECK_HOOK],[$1]) |
| 139 |
+ $2 |
| 140 |
+ |
| 141 |
+ m4_popdef([AT_TAR_CHECK_HOOK])]) |
| 142 |
+ |
| 143 |
+m4_define([TAR_IGNREC_HOOK],[ |
| 144 |
+ AT_CHECK([grep -v '^.*tar: Record size = ' stderr; exit 0]) |
| 145 |
+]) |
| 146 |
+ |
| 147 |
m4_define([RE_CHECK],[ |
| 148 |
AT_DATA([$1.re],[$2]) |
| 149 |
awk '{print NR " " $[]0}' $1 > $[]$.1 |
| 150 |
-- |
| 151 |
cgit v0.8.2 |
Archives