r2153 - trunk/patch

matthew at linuxfromscratch.org matthew at linuxfromscratch.org
Sun Jan 3 11:04:02 PST 2010


Author: matthew
Date: 2010-01-03 12:04:01 -0700 (Sun, 03 Jan 2010)
New Revision: 2153

Added:
   trunk/patch/patch-2.6.1-test_fix-1.patch
Log:
Add patch to fix a testsuite failure in Patch-2.6.1.

Added: trunk/patch/patch-2.6.1-test_fix-1.patch
===================================================================
--- trunk/patch/patch-2.6.1-test_fix-1.patch	                        (rev 0)
+++ trunk/patch/patch-2.6.1-test_fix-1.patch	2010-01-03 19:04:01 UTC (rev 2153)
@@ -0,0 +1,28 @@
+Submitted by:            Matt Burgess <matthew at linuxfromscratch.org>
+Date:                    2010-01-03
+Initial Package Version: 2.6.1
+Upstream Status:         Submitted
+Origin:                  Matt Burgess
+Description:             Prevents a test from failing when ed is not available.
+
+diff -Naur patch-2.6.1.orig/tests/crlf-handling patch-2.6.1/tests/crlf-handling
+--- patch-2.6.1.orig/tests/crlf-handling	2009-12-30 12:56:30.000000000 +0000
++++ patch-2.6.1/tests/crlf-handling	2010-01-03 11:06:00.340849916 +0000
+@@ -89,10 +89,14 @@
+ 
+ # --------------------------------------------------------------
+ 
+-diff -e a b > ab.diff
+-cp a c
+-check 'patch c < ab.diff' <<EOF
++if ! have_ed ; then
++    echo "The ed utility is not available; skipping ed related tests"
++else
++    diff -e a b > ab.diff
++    cp a c
++    check 'patch c < ab.diff' <<EOF
+ EOF
++fi
+ 
+ check 'cat -A c' <<EOF
+ 1b^M$




More information about the patches mailing list