diff options
author | Rob Landley <rob@landley.net> | 2010-08-13 15:50:26 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-08-13 15:50:26 +0200 |
commit | 1bbc0cd7f293aac5e15d6c1e16bee9f1484c6fbf (patch) | |
tree | a2a5ba8d9508982f80b702a99c2e10d1644ae40e /testsuite/patch.tests | |
parent | dcaed97e0f44d0cd285fb590ec6ec80d0d73e738 (diff) | |
download | busybox-w32-1bbc0cd7f293aac5e15d6c1e16bee9f1484c6fbf.tar.gz busybox-w32-1bbc0cd7f293aac5e15d6c1e16bee9f1484c6fbf.tar.bz2 busybox-w32-1bbc0cd7f293aac5e15d6c1e16bee9f1484c6fbf.zip |
patch: replace it with toybox's implementation
Signed-off-by: Rob Landley <rob@landley.net>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'testsuite/patch.tests')
-rwxr-xr-x | testsuite/patch.tests | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/testsuite/patch.tests b/testsuite/patch.tests index 749d936ea..6ee795dba 100755 --- a/testsuite/patch.tests +++ b/testsuite/patch.tests | |||
@@ -7,7 +7,7 @@ | |||
7 | # testing "test name" "options" "expected result" "file input" "stdin" | 7 | # testing "test name" "options" "expected result" "file input" "stdin" |
8 | 8 | ||
9 | testing "patch with old_file == new_file" \ | 9 | testing "patch with old_file == new_file" \ |
10 | 'patch; echo $?; cat input' \ | 10 | 'patch 2>&1; echo $?; cat input' \ |
11 | "\ | 11 | "\ |
12 | patching file input | 12 | patching file input |
13 | 0 | 13 | 0 |
@@ -29,7 +29,7 @@ zxc | |||
29 | " \ | 29 | " \ |
30 | 30 | ||
31 | testing "patch with nonexistent old_file" \ | 31 | testing "patch with nonexistent old_file" \ |
32 | 'patch; echo $?; cat input' \ | 32 | 'patch 2>&1; echo $?; cat input' \ |
33 | "\ | 33 | "\ |
34 | patching file input | 34 | patching file input |
35 | 0 | 35 | 0 |
@@ -51,7 +51,7 @@ zxc | |||
51 | " \ | 51 | " \ |
52 | 52 | ||
53 | testing "patch -R with nonexistent old_file" \ | 53 | testing "patch -R with nonexistent old_file" \ |
54 | 'patch -R; echo $?; cat input' \ | 54 | 'patch -R 2>&1; echo $?; cat input' \ |
55 | "\ | 55 | "\ |
56 | patching file input | 56 | patching file input |
57 | 0 | 57 | 0 |
@@ -75,9 +75,12 @@ zxc | |||
75 | testing "patch detects already applied hunk" \ | 75 | testing "patch detects already applied hunk" \ |
76 | 'patch 2>&1; echo $?; cat input' \ | 76 | 'patch 2>&1; echo $?; cat input' \ |
77 | "\ | 77 | "\ |
78 | Possibly reversed hunk 1 at 2 | ||
79 | Hunk 1 FAILED 1/1. | ||
80 | abc | ||
81 | +def | ||
82 | 123 | ||
78 | patching file input | 83 | patching file input |
79 | patch: hunk #1 FAILED at 1 | ||
80 | patch: 1 out of 1 hunk FAILED | ||
81 | 1 | 84 | 1 |
82 | abc | 85 | abc |
83 | def | 86 | def |