5239N/ASolaris-specific fixes to the tests to either explicitly use the GNU

5239N/Avariants of shell utilities, or to use the utilities using arguments that

5239N/Awill work with the Solaris variants. Not suitable for upstream.

5239N/A

5239N/A--- patchutils-0.3.1/tests/U3/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/U3/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A #

5239N/A # This is an interdiff(1) test case.

5239N/A # Test: -U3 works correctly.

5239N/A--- patchutils-0.3.1/tests/broken1/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/broken1/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A . ${top_srcdir-.}/tests/common.sh

5239N/A

5239N/A--- patchutils-0.3.1/tests/combine1/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/combine1/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -96,6 +96,6 @@

5239N/A [ -s errors ] && exit 1

5239N/A

5239N/A # There should be no fuzz.

5239N/A-patch file.a-z < patches >fuzz || exit 1

5239N/A-[ -s errors ] && exit 1

5239N/A+${PATCH} file.a-z < patches >fuzz || exit 1

5239N/A+

5239N/A exit 0

5239N/A--- patchutils-0.3.1/tests/common.sh.~1~ Wed Jun 11 03:01:28 2008

5239N/A+++ patchutils-0.3.1/tests/common.sh Fri Dec 18 10:36:24 2015

5239N/A@@ -1,17 +1,17 @@

5239N/A [ -n "$VERBOSE" ] && set -x

5239N/A-rm -rf ${ARENA:=test-arena}

5239N/A+rm -rf ${ARENA:='test-arena'}

5239N/A mkdir -p $ARENA

5239N/A top_builddir=`cd ${top_builddir-.}; pwd`

5239N/A INTERDIFF=${top_builddir}/src/interdiff

5239N/A REDIFF=${top_builddir}/src/rediff

5239N/A-COMBINEDIFF=${top_builddir}/src/combinediff

5239N/A-FLIPDIFF=${top_builddir}/src/flipdiff

5239N/A-LSDIFF=${top_builddir}/src/lsdiff

5239N/A-GREPDIFF=${top_builddir}/src/grepdiff

5239N/A-FILTERDIFF=${top_builddir}/src/filterdiff

5239N/A+COMBINEDIFF="${top_builddir}/src/interdiff --combine"

5239N/A+FLIPDIFF="${top_builddir}/src/interdiff --flip"

5239N/A+LSDIFF="${top_builddir}/src/filterdiff --list"

5239N/A+GREPDIFF="${top_builddir}/src/filterdiff --grep"

5239N/A+FILTERDIFF="${top_builddir}/src/filterdiff --filter"

5239N/A SELECTDIFF=${top_builddir}/src/selectdiff

5239N/A RECOUNTDIFF=${top_builddir}/recountdiff

5239N/A UNWRAPDIFF=${top_builddir}/unwrapdiff

5239N/A-: ${DIFF:=diff}

5239N/A-: ${PATCH:=patch -s}

5239N/A+: ${DIFF:='gdiff'}

5239N/A+: ${PATCH:='gpatch -s'}

5239N/A cd $ARENA

5239N/A--- patchutils-0.3.1/tests/flip1/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip1/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A # Test: Patch2 reduces to nothing after flip.

5239N/A@@ -29,7 +29,7 @@

5239N/A ${DIFF} -u file.orig file > patch2

5239N/A

5239N/A ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1

5239N/A-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp

5239N/A+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp

5239N/A cmp - patch-cmp << EOF || exit 1

5239N/A --- file.orig

5239N/A +++ file

5239N/A--- patchutils-0.3.1/tests/flip10/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip10/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A

5239N/A@@ -27,7 +27,7 @@

5239N/A EOF

5239N/A

5239N/A ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1

5239N/A-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp

5239N/A+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp

5239N/A cmp - patch-cmp << EOF || exit 1

5239N/A --- file.orig

5239N/A +++ file

5239N/A--- patchutils-0.3.1/tests/flip11/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip11/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A

5239N/A@@ -27,7 +27,7 @@

5239N/A EOF

5239N/A

5239N/A ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1

5239N/A-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp

5239N/A+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp

5239N/A cmp - patch-cmp << EOF || exit 1

5239N/A --- file.orig

5239N/A +++ file

5239N/A--- patchutils-0.3.1/tests/flip12/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip12/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A

5239N/A@@ -79,7 +79,7 @@

5239N/A ${DIFF} -u file.orig file > patch2

5239N/A

5239N/A ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1

5239N/A-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp

5239N/A+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp

5239N/A cmp - patch-cmp << EOF || exit 1

5239N/A --- file.orig

5239N/A +++ file

5239N/A--- patchutils-0.3.1/tests/flip13/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip13/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A

5239N/A@@ -87,7 +87,7 @@

5239N/A ${DIFF} -u file.orig file > patch2

5239N/A

5239N/A ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1

5239N/A-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp

5239N/A+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp

5239N/A cmp - patch-cmp << EOF || exit 1

5239N/A --- file.orig

5239N/A +++ file

5239N/A--- patchutils-0.3.1/tests/flip14/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip14/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A

5239N/A@@ -32,7 +32,7 @@

5239N/A ${DIFF} -u file.orig file > patch2

5239N/A

5239N/A ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1

5239N/A-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp

5239N/A+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp

5239N/A cmp - patch-cmp << EOF || exit 1

5239N/A --- file.orig

5239N/A +++ file

5239N/A--- patchutils-0.3.1/tests/flip15/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip15/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A

5239N/A@@ -27,7 +27,7 @@

5239N/A ${DIFF} -u file.orig file > patch2

5239N/A

5239N/A ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1

5239N/A-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp

5239N/A+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp

5239N/A cmp - patch-cmp << EOF || exit 1

5239N/A --- file.orig

5239N/A +++ file

5239N/A--- patchutils-0.3.1/tests/flip16/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip16/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A

5239N/A@@ -469,7 +469,7 @@

5239N/A ${DIFF} -u file.orig file > patch2

5239N/A

5239N/A ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1

5239N/A-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp

5239N/A+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp

5239N/A cmp - patch-cmp << EOF || exit 1

5239N/A --- file.orig

5239N/A +++ file

5239N/A--- patchutils-0.3.1/tests/flip17/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip17/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A

5239N/A--- patchutils-0.3.1/tests/flip18/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip18/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A

5239N/A--- patchutils-0.3.1/tests/flip19/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip19/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A # We must give an error in this case, or else complete it successfully.

5239N/A--- patchutils-0.3.1/tests/flip2/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip2/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A

5239N/A@@ -29,7 +29,7 @@

5239N/A ${DIFF} -u file.orig file > patch2

5239N/A

5239N/A ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1

5239N/A-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp

5239N/A+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp

5239N/A cmp - patch-cmp << EOF || exit 1

5239N/A --- file.orig

5239N/A +++ file

5239N/A--- patchutils-0.3.1/tests/flip3/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip3/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A

5239N/A@@ -29,7 +29,7 @@

5239N/A ${DIFF} -u file.orig file > patch2

5239N/A

5239N/A ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1

5239N/A-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp

5239N/A+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp

5239N/A cmp - patch-cmp << EOF || exit 1

5239N/A --- file.orig

5239N/A +++ file

5239N/A--- patchutils-0.3.1/tests/flip4/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip4/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A

5239N/A@@ -53,7 +53,7 @@

5239N/A ${DIFF} -u file.orig file > patch2

5239N/A

5239N/A ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1

5239N/A-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp

5239N/A+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp

5239N/A cmp - patch-cmp << EOF || exit 1

5239N/A --- file.orig

5239N/A +++ file

5239N/A--- patchutils-0.3.1/tests/flip5/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip5/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A

5239N/A@@ -59,7 +59,7 @@

5239N/A ${DIFF} -u file.orig file > patch2

5239N/A

5239N/A ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1

5239N/A-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp

5239N/A+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp

5239N/A cmp - patch-cmp << EOF || exit 1

5239N/A --- file.orig

5239N/A +++ file

5239N/A--- patchutils-0.3.1/tests/flip6/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip6/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A

5239N/A@@ -63,7 +63,7 @@

5239N/A ${DIFF} -u file.orig file > patch2

5239N/A

5239N/A ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1

5239N/A-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp

5239N/A+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp

5239N/A cmp - patch-cmp << EOF || exit 1

5239N/A --- file.orig

5239N/A +++ file

5239N/A--- patchutils-0.3.1/tests/flip7/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip7/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A

5239N/A@@ -63,7 +63,7 @@

5239N/A ${DIFF} -u file.orig file > patch2

5239N/A

5239N/A ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1

5239N/A-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp

5239N/A+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp

5239N/A cmp - patch-cmp << EOF || exit 1

5239N/A --- file.orig

5239N/A +++ file

5239N/A--- patchutils-0.3.1/tests/flip8/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip8/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A

5239N/A@@ -109,7 +109,7 @@

5239N/A ${DIFF} -u file.orig file > patch2

5239N/A

5239N/A ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1

5239N/A-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp

5239N/A+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp

5239N/A cmp - patch-cmp << EOF || exit 1

5239N/A --- file.orig

5239N/A +++ file

5239N/A--- patchutils-0.3.1/tests/flip9/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/flip9/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -1,4 +1,4 @@

5239N/A-#!/bin/sh

5239N/A+#!/bin/bash

5239N/A

5239N/A # This is a flipdiff(1) testcase.

5239N/A

5239N/A@@ -25,7 +25,7 @@

5239N/A ${DIFF} -u file2.orig file2 > patch2

5239N/A

5239N/A ${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1

5239N/A-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp

5239N/A+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp

5239N/A cmp - patch-cmp << EOF || exit 1

5239N/A --- file2.orig

5239N/A +++ file2

5239N/A--- patchutils-0.3.1/tests/nodate/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/nodate/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -20,7 +20,7 @@

5239N/A ${INTERDIFF} -U0 patch1 patch2 2>errors > patch1-2 || exit 1

5239N/A [ -s errors ] && exit 1

5239N/A cat << EOF | cmp - patch1-2 || exit 1

5239N/A-diff -U0 file file

5239N/A+${DIFF} -U0 file file

5239N/A --- file

5239N/A +++ file Nov 27 2001

5239N/A @@ -36 +36 @@

5239N/A--- patchutils-0.3.1/tests/unline1/run-test.~1~ Wed Jul 2 04:11:08 2008

5239N/A+++ patchutils-0.3.1/tests/unline1/run-test Fri Dec 18 10:36:24 2015

5239N/A@@ -25,7 +25,7 @@

5239N/A [ -s errors ] && exit 1

5239N/A

5239N/A cmp - patch1-2 << EOF || exit 1

5239N/A-diff -u file file

5239N/A+${DIFF} -u file file

5239N/A --- file

5239N/A +++ file

5239N/A @@ -1 +1 @@