diff options
| author | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-09-26 16:14:02 +0000 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-09-26 16:14:07 +0000 |
| commit | 40155debf7d5f16e82cd95541de8676a919cb146 (patch) | |
| tree | 9b3dcf55fcb82ec8eace90ec9d8657d3d33a9da4 /testing/icdiff/disable-git-diff-test.patch | |
| parent | 379c28e2d5e45e325fac6af51cca1c08d3b68e62 (diff) | |
| download | aports-40155debf7d5f16e82cd95541de8676a919cb146.tar.bz2 aports-40155debf7d5f16e82cd95541de8676a919cb146.tar.xz | |
testing/icdiff: upgrade to 1.9.5
Diffstat (limited to 'testing/icdiff/disable-git-diff-test.patch')
| -rw-r--r-- | testing/icdiff/disable-git-diff-test.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/testing/icdiff/disable-git-diff-test.patch b/testing/icdiff/disable-git-diff-test.patch new file mode 100644 index 0000000000..fc28d3ebfe --- /dev/null +++ b/testing/icdiff/disable-git-diff-test.patch @@ -0,0 +1,15 @@ +This test is failing because it assumes to be run in it's own repository. + +See https://github.com/jeffkaufman/icdiff/issues/166 +diff --git a/test.sh b/test.sh +index 99729d7234..bad21cd213 100755 +--- a/test.sh ++++ b/test.sh +@@ -144,7 +144,6 @@ check_gold gold-subcolors-bad-color tests/input-{1,2}.txt --cols=80 --color-map= + check_gold gold-subcolors-bad-cat tests/input-{1,2}.txt --cols=80 --color-map='chnge:magenta,description:cyan_bold' + check_gold gold-subcolors-bad-fmt tests/input-{1,2}.txt --cols=80 --color-map='change:magenta:gold,description:cyan_bold' + check_gold gold-bad-encoding.txt tests/input-{1,2}.txt --encoding=nonexistend_encoding +-check_git_diff gitdiff-only-newlines.txt 4e86205629~1 4e86205629 + + # Testing pipe behavior doesn't fit well with the check_gold system + $INVOCATION tests/input-{4,5}.txt 2>/tmp/icdiff-pipe-error-output | head -n 1 |