From 223494af1059a86383cd8b02834a1d299be74454 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sun, 07 Apr 2019 20:34:22 -0400 Subject: patches/0002-Test-suite-compatibility-fixes.patch: Re-add --- (limited to 'patches') diff --git a/patches/0002-Test-suite-compatibility-fixes.patch b/patches/0002-Test-suite-compatibility-fixes.patch new file mode 100644 index 0000000..07de67c --- /dev/null +++ b/patches/0002-Test-suite-compatibility-fixes.patch @@ -0,0 +1,90 @@ +From f6bc5b14bd193859851d15a049bafb1007acd288 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Wed, 7 Feb 2018 12:10:41 +0100 +Subject: [PATCH 02/17] Test suite compatibility fixes + +* tests/crlf-handling, tests/git-cleanup, tests/test-lib.sh: Use printf +instead of echo -e / echo -n for compatibility with systems that don't +support these echo options. +* tests/merge: Minor other cleanups. +--- + tests/crlf-handling | 2 +- + tests/git-cleanup | 4 ++-- + tests/merge | 18 ++++++++---------- + tests/test-lib.sh | 21 +++++++-------------- + 4 files changed, 18 insertions(+), 27 deletions(-) + +diff --git a/tests/crlf-handling b/tests/crlf-handling +index 239149c..c192cac 100644 +--- a/tests/crlf-handling ++++ b/tests/crlf-handling +@@ -14,7 +14,7 @@ use_local_patch + use_tmpdir + + lf2crlf() { +- while read l; do echo -e "$l\r"; done ++ while read l; do printf "%s\r\n" "$l"; done + } + + echo 1 > a +diff --git a/tests/git-cleanup b/tests/git-cleanup +index 2e3e4c6..ca527a1 100644 +--- a/tests/git-cleanup ++++ b/tests/git-cleanup +@@ -36,8 +36,8 @@ BAD PATCH + EOF + + echo 1 > f +-echo -n '' > g +-echo -n '' > h ++printf '' > g ++printf '' > h + + check 'patch -f -i 1.diff || echo status: $?' < a.sed +- echo "$body" | sed -f a.sed > b ++ done > b.sed ++ echo "$body" | sed -f b.sed > b + shift + while test $# -gt 0 ; do + echo "$1" + shift +- done > b.sed +- echo "$body" | sed -f b.sed > c +- rm -f a.sed b.sed ++ done > c.sed ++ echo "$body" | sed -f c.sed > c ++ rm -f b.sed c.sed + output=`diff -u a b | patch $ARGS -f c` + status=$? + echo "$output" | sed -e '/^$/d' -e '/^patching file c$/d' + cat c +- test $status == 0 || echo "Status: $status" ++ test $status = 0 || echo "Status: $status" + } + + x() { +- ARGS="$ARGS --merge" x2 "$@" ++ ARGS="--merge" x2 "$@" + echo +- ARGS="$ARGS --merge=diff3" x2 "$@" ++ ARGS="--merge=diff3" x2 "$@" + } + +-unset ARGS +- + # ============================================================== + + check 'x 3' <