| 1 |
vapier 08/04/13 23:23:11 |
| 2 |
|
| 3 |
Added: automake-1.10.1-tests.patch |
| 4 |
Log: |
| 5 |
Add fix from upstream for instsh2.test failure #217513 by Markus Rothe. |
| 6 |
(Portage version: 2.2_pre5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-devel/automake/files/automake-1.10.1-tests.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/automake/files/automake-1.10.1-tests.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/automake/files/automake-1.10.1-tests.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: automake-1.10.1-tests.patch |
| 15 |
=================================================================== |
| 16 |
commit eed743342cfa0ff8cc69666243233229e7417f8f |
| 17 |
Author: Ralf Wildenhues <Ralf.Wildenhues@×××.de> |
| 18 |
Date: Wed Jan 30 21:23:16 2008 +0100 |
| 19 |
|
| 20 |
Split instsh2.test, so that only the new part requires non-root. |
| 21 |
|
| 22 |
* tests/instsh2.test: Split off testing of `install-sh -C' ... |
| 23 |
* tests/instsh3.test: ... to this new test, requiring non-root. |
| 24 |
* tests/Makefile.am: Adjust. |
| 25 |
* THANKS: Update. |
| 26 |
Report by Theodoros V. Kalamatianos. |
| 27 |
|
| 28 |
diff --git a/tests/Makefile.am b/tests/Makefile.am |
| 29 |
index ec10801..8405c7a 100644 |
| 30 |
--- a/tests/Makefile.am |
| 31 |
+++ b/tests/Makefile.am |
| 32 |
@@ -293,6 +293,7 @@ install2.test \ |
| 33 |
installdir.test \ |
| 34 |
instsh.test \ |
| 35 |
instsh2.test \ |
| 36 |
+instsh3.test \ |
| 37 |
instdat.test \ |
| 38 |
instdat2.test \ |
| 39 |
instexec.test \ |
| 40 |
diff --git a/tests/Makefile.in b/tests/Makefile.in |
| 41 |
index 6ba81ab..1bcb573 100644 |
| 42 |
--- a/tests/Makefile.in |
| 43 |
+++ b/tests/Makefile.in |
| 44 |
@@ -442,6 +442,7 @@ install2.test \ |
| 45 |
installdir.test \ |
| 46 |
instsh.test \ |
| 47 |
instsh2.test \ |
| 48 |
+instsh3.test \ |
| 49 |
instdat.test \ |
| 50 |
instdat2.test \ |
| 51 |
instexec.test \ |
| 52 |
diff --git a/tests/instsh2.test b/tests/instsh2.test |
| 53 |
index 17b61ab..f0b729e 100755 |
| 54 |
--- a/tests/instsh2.test |
| 55 |
+++ b/tests/instsh2.test |
| 56 |
@@ -1,5 +1,5 @@ |
| 57 |
#! /bin/sh |
| 58 |
-# Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc. |
| 59 |
+# Copyright (C) 2002, 2004, 2006, 2008 Free Software Foundation, Inc. |
| 60 |
# |
| 61 |
# This program is free software; you can redistribute it and/or modify |
| 62 |
# it under the terms of the GNU General Public License as published by |
| 63 |
@@ -77,20 +77,6 @@ test -f d3/y |
| 64 |
./install-sh -T x d3 && exit 1 |
| 65 |
./install-sh -T x d4// && exit 1 |
| 66 |
|
| 67 |
-# Do not change the timestamps when using -C. |
| 68 |
-echo foo >file |
| 69 |
-./install-sh -C file d1 |
| 70 |
-TZ=UTC0 touch -t $old_timestamp d1/file |
| 71 |
-./install-sh -C file d1 |
| 72 |
-is_newest file d1/file |
| 73 |
-echo foo1 >file |
| 74 |
-./install-sh -C file d1 |
| 75 |
-diff file d1/file |
| 76 |
-# Rights must be updated. |
| 77 |
-./install-sh -C -m 444 file d1 |
| 78 |
-test -r d1/file |
| 79 |
-test ! -w d1/file |
| 80 |
- |
| 81 |
# Ensure that install-sh works with names that include spaces |
| 82 |
touch 'a b' |
| 83 |
mkdir 'x y' |
| 84 |
diff --git a/tests/instsh3.test b/tests/instsh3.test |
| 85 |
new file mode 100755 |
| 86 |
index 0000000..95b74c7 |
| 87 |
--- /dev/null |
| 88 |
+++ b/tests/instsh3.test |
| 89 |
@@ -0,0 +1,37 @@ |
| 90 |
+#! /bin/sh |
| 91 |
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc. |
| 92 |
+# |
| 93 |
+# This program is free software; you can redistribute it and/or modify |
| 94 |
+# it under the terms of the GNU General Public License as published by |
| 95 |
+# the Free Software Foundation; either version 3, or (at your option) |
| 96 |
+# any later version. |
| 97 |
+# |
| 98 |
+# This program is distributed in the hope that it will be useful, |
| 99 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 100 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 101 |
+# GNU General Public License for more details. |
| 102 |
+# |
| 103 |
+# You should have received a copy of the GNU General Public License |
| 104 |
+# along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 105 |
+ |
| 106 |
+# More install-sh checks: check -C. |
| 107 |
+ |
| 108 |
+required=non-root |
| 109 |
+. ./defs || exit 1 |
| 110 |
+set -e |
| 111 |
+ |
| 112 |
+./install-sh -d d1 |
| 113 |
+ |
| 114 |
+# Do not change the timestamps when using -C. |
| 115 |
+echo foo >file |
| 116 |
+./install-sh -C file d1 |
| 117 |
+TZ=UTC0 touch -t $old_timestamp d1/file |
| 118 |
+./install-sh -C file d1 |
| 119 |
+is_newest file d1/file |
| 120 |
+echo foo1 >file |
| 121 |
+./install-sh -C file d1 |
| 122 |
+diff file d1/file |
| 123 |
+# Rights must be updated. |
| 124 |
+./install-sh -C -m 444 file d1 |
| 125 |
+test -r d1/file |
| 126 |
+test ! -w d1/file |
| 127 |
|
| 128 |
|
| 129 |
|
| 130 |
-- |
| 131 |
gentoo-commits@l.g.o mailing list |
Archives