diff options
Diffstat (limited to 'testsuite')
-rwxr-xr-x | testsuite/patch.tests | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/testsuite/patch.tests b/testsuite/patch.tests index 6ee795dba..e663b32a3 100755 --- a/testsuite/patch.tests +++ b/testsuite/patch.tests | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | . ./testing.sh | 5 | . ./testing.sh |
6 | 6 | ||
7 | # testing "test name" "options" "expected result" "file input" "stdin" | 7 | # testing "test name" "command(s)" "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 2>&1; echo $?; cat input' \ | 10 | 'patch 2>&1; echo $?; cat input' \ |
@@ -126,6 +126,31 @@ abc | |||
126 | +456 | 126 | +456 |
127 | " \ | 127 | " \ |
128 | 128 | ||
129 | # testing "test name" "command(s)" "expected result" "file input" "stdin" | ||
130 | |||
131 | testing "patch -N ignores already applied hunk" \ | ||
132 | 'patch -N 2>&1; echo $?; cat input' \ | ||
133 | "\ | ||
134 | patching file input | ||
135 | 0 | ||
136 | abc | ||
137 | def | ||
138 | 123 | ||
139 | " \ | ||
140 | "\ | ||
141 | abc | ||
142 | def | ||
143 | 123 | ||
144 | " \ | ||
145 | "\ | ||
146 | --- input | ||
147 | +++ input | ||
148 | @@ -1,2 +1,3 @@ | ||
149 | abc | ||
150 | +def | ||
151 | 123 | ||
152 | " \ | ||
153 | |||
129 | rm input.orig 2>/dev/null | 154 | rm input.orig 2>/dev/null |
130 | 155 | ||
131 | exit $FAILCOUNT | 156 | exit $FAILCOUNT |