diff options
| author | Ron Yorston <rmy@pobox.com> | 2015-03-14 20:33:00 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2015-03-14 20:33:00 +0000 |
| commit | a4f58436b78fe59e57620c6e0301f213ee25f273 (patch) | |
| tree | 8355f724926e605280af2d6f2b1ccc6b1bd02dee /testsuite/diff.tests | |
| parent | ba0c36cfcf84efbac6f89e27238e04bb57e9cd45 (diff) | |
| parent | 49acc1a7618a28d34381cbb7661d7c981fcb238f (diff) | |
| download | busybox-w32-a4f58436b78fe59e57620c6e0301f213ee25f273.tar.gz busybox-w32-a4f58436b78fe59e57620c6e0301f213ee25f273.tar.bz2 busybox-w32-a4f58436b78fe59e57620c6e0301f213ee25f273.zip | |
Merge branch 'busybox' into merge
Conflicts:
coreutils/od_bloaty.c
libbb/lineedit.c
Diffstat (limited to 'testsuite/diff.tests')
| -rwxr-xr-x | testsuite/diff.tests | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/testsuite/diff.tests b/testsuite/diff.tests index 6de46483b..84d853852 100755 --- a/testsuite/diff.tests +++ b/testsuite/diff.tests | |||
| @@ -44,6 +44,17 @@ testing "diff of stdin, twice" \ | |||
| 44 | "" \ | 44 | "" \ |
| 45 | "stdin" | 45 | "stdin" |
| 46 | 46 | ||
| 47 | testing "diff of empty file against stdin" \ | ||
| 48 | "diff -u - input | $TRIM_TAB" \ | ||
| 49 | "\ | ||
| 50 | --- - | ||
| 51 | +++ input | ||
| 52 | @@ -1 +0,0 @@ | ||
| 53 | -a | ||
| 54 | " \ | ||
| 55 | "" \ | ||
| 56 | "a\n" | ||
| 57 | |||
| 47 | testing "diff of empty file against nonempty one" \ | 58 | testing "diff of empty file against nonempty one" \ |
| 48 | "diff -u - input | $TRIM_TAB" \ | 59 | "diff -u - input | $TRIM_TAB" \ |
| 49 | "\ | 60 | "\ |