diff options
| author | P. J. McDermott <pj@pehjota.net> | 2014-10-13 14:53:07 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2014-10-13 14:53:07 (EDT) |
| commit | 541fb031bf6c72a23bf1c8402ce044753126333c (patch) | |
| tree | 676c4d71f0b047f62e7f442e2ce417e1cc7b0a99 | |
| parent | fa70aef7c61307d442cfb7c5769e30df8b54867a (diff) | |
Add patches to fix tests on BusyBox
| -rw-r--r-- | patches/01_corrupt-reject-files-test-portability.patch | 15 | ||||
| -rw-r--r-- | patches/02_skip-ed-tests.patch | 19 |
2 files changed, 34 insertions, 0 deletions
diff --git a/patches/01_corrupt-reject-files-test-portability.patch b/patches/01_corrupt-reject-files-test-portability.patch new file mode 100644 index 0000000..b8bebc9 --- /dev/null +++ b/patches/01_corrupt-reject-files-test-portability.patch @@ -0,0 +1,15 @@ +Author: "P. J. McDermott" <pj@pehjota.net> +Subject: tests/corrupt-reject-files: Use "sed" instead of "cat -E" + +diff -Naur src.orig/tests/corrupt-reject-files src/tests/corrupt-reject-files +--- src.orig/tests/corrupt-reject-files 2012-04-06 06:57:37.000000000 -0400 ++++ src/tests/corrupt-reject-files 2014-10-13 14:27:29.493964816 -0400 +@@ -46,7 +46,7 @@ + Status: 1 + EOF + +-check 'cat -ve a.rej' <<EOF ++check 'sed "s/\$/\$/" a.rej' <<EOF + *** a$ + --- b$ + ***************$ diff --git a/patches/02_skip-ed-tests.patch b/patches/02_skip-ed-tests.patch new file mode 100644 index 0000000..a3d8f2e --- /dev/null +++ b/patches/02_skip-ed-tests.patch @@ -0,0 +1,19 @@ +Author: "P. J. McDermott" <pj@pehjota.net> +Subject: tests/need-filename: Disable ed tests + +BusyBox ed prints "No such file or directory" on one of the tests. + +diff -Naur src.orig/tests/need-filename src/tests/need-filename +--- src.orig/tests/need-filename 2012-04-06 06:57:37.000000000 -0400 ++++ src/tests/need-filename 2014-10-13 14:45:48.647840738 -0400 +@@ -39,8 +39,8 @@ + + # ============================================================== + +-if ! have_ed ; then +- echo "The ed utility is not available; skipping ed related tests" ++if true ; then ++ echo "ed related tests disabled" + else + cat > e.diff <<EOF + 0a |