source: patches/patch-2.6.1-test_fix-1.patch@ 10d3d46

clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 10d3d46 was 9d2405f, checked in by Jonathan Norman <jon@…>, 13 years ago

Enabled Patch's test suite and added LFS's patch test patch

  • Property mode set to 100644
File size: 892 bytes
RevLine 
[9d2405f]1Submitted by: Matt Burgess <matthew at linuxfromscratch.org>
2Date: 2010-01-03
3Initial Package Version: 2.6.1
4Upstream Status: Submitted
5Origin: Matt Burgess
6Description: Prevents a test from failing when ed is not available.
7
8diff -Naur patch-2.6.1.orig/tests/crlf-handling patch-2.6.1/tests/crlf-handling
9--- patch-2.6.1.orig/tests/crlf-handling 2009-12-30 12:56:30.000000000 +0000
10+++ patch-2.6.1/tests/crlf-handling 2010-01-03 11:06:00.340849916 +0000
11@@ -89,10 +89,14 @@
12
13 # --------------------------------------------------------------
14
15-diff -e a b > ab.diff
16-cp a c
17-check 'patch c < ab.diff' <<EOF
18+if ! have_ed ; then
19+ echo "The ed utility is not available; skipping ed related tests"
20+else
21+ diff -e a b > ab.diff
22+ cp a c
23+ check 'patch c < ab.diff' <<EOF
24 EOF
25+fi
26
27 check 'cat -A c' <<EOF
28 1b^M$
Note: See TracBrowser for help on using the repository browser.