diff options
| author |   Patrick McLean <patrick.mclean@sony.com> | 2020-05-31 12:36:50 -0700 |
|---|---|---|
| committer |   Patrick McLean <chutzpah@gentoo.org> | 2020-05-31 12:36:59 -0700 |
| commit | 936f9af6ded55fccbaa72cba829766c20853bd03 (patch) | |
| tree | 2f93334fc7229380406e5f8a236345eafb4844ab /app-misc/icdiff/files | |
| parent | app-text/blogc: version bump (diff) | |
| download | gentoo-936f9af6ded55fccbaa72cba829766c20853bd03.tar.gz gentoo-936f9af6ded55fccbaa72cba829766c20853bd03.tar.bz2 gentoo-936f9af6ded55fccbaa72cba829766c20853bd03.zip | |
app-misc/icdiff-1.9.5: Version bump (bug #713096)
Closes: https://bugs.gentoo.org/713096
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'app-misc/icdiff/files')
| -rw-r--r-- | app-misc/icdiff/files/icdiff-1.9.5-tests.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/app-misc/icdiff/files/icdiff-1.9.5-tests.patch b/app-misc/icdiff/files/icdiff-1.9.5-tests.patch new file mode 100644 index 000000000000..3e2467460d2c --- /dev/null +++ b/app-misc/icdiff/files/icdiff-1.9.5-tests.patch @@ -0,0 +1,29 @@ +diff --git a/test.sh b/test.sh +index fd1679e..5b756f3 100755 +--- a/test.sh ++++ b/test.sh +@@ -86,6 +86,8 @@ function check_git_diff() { + local gitdiff=tests/$1 + shift + ++ # does not work with newer versions of git ++ if false; then + echo " check_gitdiff $gitdiff matches git icdiff $@" + # Check when using icdiff in git + if $FIRST_TIME_CHECK_GIT_DIFF; then +@@ -96,13 +98,14 @@ function check_git_diff() { + export PATH=$PATH:"$(pwd)" + fi + local tmp=/tmp/git-icdiff.output +- git icdiff $1 $2 &> $tmp ++ git icdiff --no-index $1 $2 &> $tmp + if ! diff $tmp $gitdiff; then + echo "Got: ($tmp)" + cat $tmp + echo "Expected: ($gitdiff)" + fail + fi ++ fi + } + + check_gold gold-recursive.txt --recursive tests/{a,b} --cols=80 |