diff options
| author | Denys Vlasenko | 2010-07-25 00:13:27 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2010-07-25 00:13:27 +0200 |
| commit | 503a07cab24a1e58099a04970babd2b761469449 (patch) | |
| tree | f96b01fd405adcbcbeed0086389da27bd1a07ccc /testsuite/diff.tests | |
| parent | b2d95147c989448f23cc59c63b83e2d89f0bd9cd (diff) | |
| download | busybox-503a07cab24a1e58099a04970babd2b761469449.zip busybox-503a07cab24a1e58099a04970babd2b761469449.tar.gz | |
Apply post-1.17.0 fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'testsuite/diff.tests')
| -rwxr-xr-x | testsuite/diff.tests | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/testsuite/diff.tests b/testsuite/diff.tests index 06d5a4f..27a4b33 100755 --- a/testsuite/diff.tests +++ b/testsuite/diff.tests @@ -4,7 +4,7 @@ . ./testing.sh -# testing "test name" "options" "expected result" "file input" "stdin" +# testing "test name" "commands" "expected result" "file input" "stdin" # diff outputs date/time in the header, which should not be analysed # NB: sed has tab character in s command! @@ -100,9 +100,11 @@ testing "diff always takes context from old file" \ "abc\na c\ndef\n" \ "a c\n" -# testing "test name" "options" "expected result" "file input" "stdin" +# testing "test name" "commands" "expected result" "file input" "stdin" +# clean up rm -rf diff1 diff2 + mkdir diff1 diff2 diff2/subdir echo qwe >diff1/- echo asd >diff2/subdir/- @@ -187,4 +189,29 @@ SKIP= # clean up rm -rf diff1 diff2 +# NOT using directory structure from prev test... +mkdir diff1 diff2 +echo qwe >diff1/- +echo rty >diff2/- +optional FEATURE_DIFF_DIR +testing "diff diff1 diff2/" \ + "diff -ur diff1 diff2/ | $TRIM_TAB; diff -ur .///diff1 diff2//// | $TRIM_TAB" \ +"\ +--- diff1/- ++++ diff2/- +@@ -1 +1 @@ +-qwe ++rty +--- .///diff1/- ++++ diff2////- +@@ -1 +1 @@ +-qwe ++rty +" \ + "" "" +SKIP= + +# clean up +rm -rf diff1 diff2 + exit $FAILCOUNT |