author | John Beck <John.Beck@Oracle.COM> |
Fri, 08 Jan 2016 08:25:03 -0800 | |
changeset 5247 | caadbfa6ec4c |
parent 5241 | 21a30e6ac5fd |
permissions | -rw-r--r-- |
5241
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
1 |
Solaris-specific fixes to the tests to either explicitly use the GNU |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
2 |
variants of shell utilities, or to use the utilities using arguments that |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
3 |
will work with the Solaris variants. Not suitable for upstream. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
4 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
5 |
--- patchutils-0.3.1/tests/U3/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
6 |
+++ patchutils-0.3.1/tests/U3/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
7 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
8 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
9 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
10 |
# |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
11 |
# This is an interdiff(1) test case. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
12 |
# Test: -U3 works correctly. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
13 |
--- patchutils-0.3.1/tests/broken1/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
14 |
+++ patchutils-0.3.1/tests/broken1/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
15 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
16 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
17 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
18 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
19 |
. ${top_srcdir-.}/tests/common.sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
20 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
21 |
--- patchutils-0.3.1/tests/combine1/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
22 |
+++ patchutils-0.3.1/tests/combine1/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
23 |
@@ -96,6 +96,6 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
24 |
[ -s errors ] && exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
25 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
26 |
# There should be no fuzz. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
27 |
-patch file.a-z < patches >fuzz || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
28 |
-[ -s errors ] && exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
29 |
+${PATCH} file.a-z < patches >fuzz || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
30 |
+ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
31 |
exit 0 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
32 |
--- patchutils-0.3.1/tests/common.sh.~1~ Wed Jun 11 03:01:28 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
33 |
+++ patchutils-0.3.1/tests/common.sh Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
34 |
@@ -1,17 +1,17 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
35 |
[ -n "$VERBOSE" ] && set -x |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
36 |
-rm -rf ${ARENA:=test-arena} |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
37 |
+rm -rf ${ARENA:='test-arena'} |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
38 |
mkdir -p $ARENA |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
39 |
top_builddir=`cd ${top_builddir-.}; pwd` |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
40 |
INTERDIFF=${top_builddir}/src/interdiff |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
41 |
REDIFF=${top_builddir}/src/rediff |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
42 |
-COMBINEDIFF=${top_builddir}/src/combinediff |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
43 |
-FLIPDIFF=${top_builddir}/src/flipdiff |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
44 |
-LSDIFF=${top_builddir}/src/lsdiff |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
45 |
-GREPDIFF=${top_builddir}/src/grepdiff |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
46 |
-FILTERDIFF=${top_builddir}/src/filterdiff |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
47 |
+COMBINEDIFF="${top_builddir}/src/interdiff --combine" |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
48 |
+FLIPDIFF="${top_builddir}/src/interdiff --flip" |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
49 |
+LSDIFF="${top_builddir}/src/filterdiff --list" |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
50 |
+GREPDIFF="${top_builddir}/src/filterdiff --grep" |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
51 |
+FILTERDIFF="${top_builddir}/src/filterdiff --filter" |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
52 |
SELECTDIFF=${top_builddir}/src/selectdiff |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
53 |
RECOUNTDIFF=${top_builddir}/recountdiff |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
54 |
UNWRAPDIFF=${top_builddir}/unwrapdiff |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
55 |
-: ${DIFF:=diff} |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
56 |
-: ${PATCH:=patch -s} |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
57 |
+: ${DIFF:='gdiff'} |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
58 |
+: ${PATCH:='gpatch -s'} |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
59 |
cd $ARENA |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
60 |
--- patchutils-0.3.1/tests/flip1/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
61 |
+++ patchutils-0.3.1/tests/flip1/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
62 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
63 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
64 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
65 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
66 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
67 |
# Test: Patch2 reduces to nothing after flip. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
68 |
@@ -29,7 +29,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
69 |
${DIFF} -u file.orig file > patch2 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
70 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
71 |
${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
72 |
-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
73 |
+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
74 |
cmp - patch-cmp << EOF || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
75 |
--- file.orig |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
76 |
+++ file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
77 |
--- patchutils-0.3.1/tests/flip10/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
78 |
+++ patchutils-0.3.1/tests/flip10/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
79 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
80 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
81 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
82 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
83 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
84 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
85 |
@@ -27,7 +27,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
86 |
EOF |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
87 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
88 |
${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
89 |
-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
90 |
+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
91 |
cmp - patch-cmp << EOF || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
92 |
--- file.orig |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
93 |
+++ file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
94 |
--- patchutils-0.3.1/tests/flip11/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
95 |
+++ patchutils-0.3.1/tests/flip11/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
96 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
97 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
98 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
99 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
100 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
101 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
102 |
@@ -27,7 +27,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
103 |
EOF |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
104 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
105 |
${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
106 |
-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
107 |
+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
108 |
cmp - patch-cmp << EOF || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
109 |
--- file.orig |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
110 |
+++ file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
111 |
--- patchutils-0.3.1/tests/flip12/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
112 |
+++ patchutils-0.3.1/tests/flip12/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
113 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
114 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
115 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
116 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
117 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
118 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
119 |
@@ -79,7 +79,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
120 |
${DIFF} -u file.orig file > patch2 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
121 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
122 |
${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
123 |
-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
124 |
+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
125 |
cmp - patch-cmp << EOF || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
126 |
--- file.orig |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
127 |
+++ file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
128 |
--- patchutils-0.3.1/tests/flip13/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
129 |
+++ patchutils-0.3.1/tests/flip13/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
130 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
131 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
132 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
133 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
134 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
135 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
136 |
@@ -87,7 +87,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
137 |
${DIFF} -u file.orig file > patch2 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
138 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
139 |
${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
140 |
-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
141 |
+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
142 |
cmp - patch-cmp << EOF || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
143 |
--- file.orig |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
144 |
+++ file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
145 |
--- patchutils-0.3.1/tests/flip14/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
146 |
+++ patchutils-0.3.1/tests/flip14/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
147 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
148 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
149 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
150 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
151 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
152 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
153 |
@@ -32,7 +32,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
154 |
${DIFF} -u file.orig file > patch2 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
155 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
156 |
${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
157 |
-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
158 |
+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
159 |
cmp - patch-cmp << EOF || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
160 |
--- file.orig |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
161 |
+++ file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
162 |
--- patchutils-0.3.1/tests/flip15/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
163 |
+++ patchutils-0.3.1/tests/flip15/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
164 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
165 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
166 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
167 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
168 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
169 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
170 |
@@ -27,7 +27,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
171 |
${DIFF} -u file.orig file > patch2 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
172 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
173 |
${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
174 |
-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
175 |
+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
176 |
cmp - patch-cmp << EOF || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
177 |
--- file.orig |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
178 |
+++ file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
179 |
--- patchutils-0.3.1/tests/flip16/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
180 |
+++ patchutils-0.3.1/tests/flip16/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
181 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
182 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
183 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
184 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
185 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
186 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
187 |
@@ -469,7 +469,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
188 |
${DIFF} -u file.orig file > patch2 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
189 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
190 |
${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
191 |
-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
192 |
+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
193 |
cmp - patch-cmp << EOF || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
194 |
--- file.orig |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
195 |
+++ file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
196 |
--- patchutils-0.3.1/tests/flip17/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
197 |
+++ patchutils-0.3.1/tests/flip17/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
198 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
199 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
200 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
201 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
202 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
203 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
204 |
--- patchutils-0.3.1/tests/flip18/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
205 |
+++ patchutils-0.3.1/tests/flip18/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
206 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
207 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
208 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
209 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
210 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
211 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
212 |
--- patchutils-0.3.1/tests/flip19/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
213 |
+++ patchutils-0.3.1/tests/flip19/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
214 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
215 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
216 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
217 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
218 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
219 |
# We must give an error in this case, or else complete it successfully. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
220 |
--- patchutils-0.3.1/tests/flip2/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
221 |
+++ patchutils-0.3.1/tests/flip2/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
222 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
223 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
224 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
225 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
226 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
227 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
228 |
@@ -29,7 +29,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
229 |
${DIFF} -u file.orig file > patch2 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
230 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
231 |
${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
232 |
-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
233 |
+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
234 |
cmp - patch-cmp << EOF || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
235 |
--- file.orig |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
236 |
+++ file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
237 |
--- patchutils-0.3.1/tests/flip3/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
238 |
+++ patchutils-0.3.1/tests/flip3/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
239 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
240 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
241 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
242 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
243 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
244 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
245 |
@@ -29,7 +29,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
246 |
${DIFF} -u file.orig file > patch2 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
247 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
248 |
${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
249 |
-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
250 |
+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
251 |
cmp - patch-cmp << EOF || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
252 |
--- file.orig |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
253 |
+++ file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
254 |
--- patchutils-0.3.1/tests/flip4/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
255 |
+++ patchutils-0.3.1/tests/flip4/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
256 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
257 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
258 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
259 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
260 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
261 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
262 |
@@ -53,7 +53,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
263 |
${DIFF} -u file.orig file > patch2 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
264 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
265 |
${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
266 |
-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
267 |
+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
268 |
cmp - patch-cmp << EOF || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
269 |
--- file.orig |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
270 |
+++ file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
271 |
--- patchutils-0.3.1/tests/flip5/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
272 |
+++ patchutils-0.3.1/tests/flip5/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
273 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
274 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
275 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
276 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
277 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
278 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
279 |
@@ -59,7 +59,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
280 |
${DIFF} -u file.orig file > patch2 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
281 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
282 |
${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
283 |
-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
284 |
+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
285 |
cmp - patch-cmp << EOF || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
286 |
--- file.orig |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
287 |
+++ file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
288 |
--- patchutils-0.3.1/tests/flip6/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
289 |
+++ patchutils-0.3.1/tests/flip6/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
290 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
291 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
292 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
293 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
294 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
295 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
296 |
@@ -63,7 +63,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
297 |
${DIFF} -u file.orig file > patch2 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
298 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
299 |
${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
300 |
-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
301 |
+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
302 |
cmp - patch-cmp << EOF || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
303 |
--- file.orig |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
304 |
+++ file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
305 |
--- patchutils-0.3.1/tests/flip7/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
306 |
+++ patchutils-0.3.1/tests/flip7/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
307 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
308 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
309 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
310 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
311 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
312 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
313 |
@@ -63,7 +63,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
314 |
${DIFF} -u file.orig file > patch2 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
315 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
316 |
${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
317 |
-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
318 |
+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
319 |
cmp - patch-cmp << EOF || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
320 |
--- file.orig |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
321 |
+++ file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
322 |
--- patchutils-0.3.1/tests/flip8/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
323 |
+++ patchutils-0.3.1/tests/flip8/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
324 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
325 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
326 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
327 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
328 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
329 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
330 |
@@ -109,7 +109,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
331 |
${DIFF} -u file.orig file > patch2 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
332 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
333 |
${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
334 |
-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
335 |
+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
336 |
cmp - patch-cmp << EOF || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
337 |
--- file.orig |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
338 |
+++ file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
339 |
--- patchutils-0.3.1/tests/flip9/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
340 |
+++ patchutils-0.3.1/tests/flip9/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
341 |
@@ -1,4 +1,4 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
342 |
-#!/bin/sh |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
343 |
+#!/bin/bash |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
344 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
345 |
# This is a flipdiff(1) testcase. |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
346 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
347 |
@@ -25,7 +25,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
348 |
${DIFF} -u file2.orig file2 > patch2 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
349 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
350 |
${FLIPDIFF} patch1 patch2 > patch-flipped || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
351 |
-sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
352 |
+sed -e "s/$(/bin/echo '\t').*$//" patch-flipped > patch-cmp |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
353 |
cmp - patch-cmp << EOF || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
354 |
--- file2.orig |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
355 |
+++ file2 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
356 |
--- patchutils-0.3.1/tests/nodate/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
357 |
+++ patchutils-0.3.1/tests/nodate/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
358 |
@@ -20,7 +20,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
359 |
${INTERDIFF} -U0 patch1 patch2 2>errors > patch1-2 || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
360 |
[ -s errors ] && exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
361 |
cat << EOF | cmp - patch1-2 || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
362 |
-diff -U0 file file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
363 |
+${DIFF} -U0 file file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
364 |
--- file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
365 |
+++ file Nov 27 2001 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
366 |
@@ -36 +36 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
367 |
--- patchutils-0.3.1/tests/unline1/run-test.~1~ Wed Jul 2 04:11:08 2008 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
368 |
+++ patchutils-0.3.1/tests/unline1/run-test Fri Dec 18 10:36:24 2015 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
369 |
@@ -25,7 +25,7 @@ |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
370 |
[ -s errors ] && exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
371 |
|
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
372 |
cmp - patch1-2 << EOF || exit 1 |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
373 |
-diff -u file file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
374 |
+${DIFF} -u file file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
375 |
--- file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
376 |
+++ file |
21a30e6ac5fd
22393841 migrate patchutils to Userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
377 |
@@ -1 +1 @@ |