mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
app-misc/icdiff: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Part-of: https://github.com/gentoo/gentoo/pull/41761 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
This commit is contained in:
committed by
Conrad Kostecki
parent
8b0f43f13d
commit
1dd225f7f5
@@ -1,40 +0,0 @@
|
||||
diff --git a/test.sh b/test.sh
|
||||
index 317a752..10456ff 100755
|
||||
--- a/test.sh
|
||||
+++ b/test.sh
|
||||
@@ -158,9 +158,9 @@ check_gold 0 gold-identical-on.txt tests/input-{1,1}.txt -s
|
||||
check_gold 2 gold-bad-encoding.txt tests/input-{1,2}.txt --encoding=nonexistend_encoding
|
||||
check_gold 0 gold-recursive-with-exclude.txt --recursive -x c tests/{a,b} --cols=80
|
||||
check_gold 1 gold-recursive-with-exclude2.txt --recursive -x 'excl*' tests/test-with-exclude/{a,b} --cols=80
|
||||
-check_gold 0 gold-exit-process-sub tests/input-1.txt <(cat tests/input-1.txt) --cols=80
|
||||
+check_gold 0 gold-exit-process-sub tests/input-1.txt <(cat tests/input-1.txt) --no-headers --cols=80
|
||||
|
||||
-rm tests/permissions-{a,b}
|
||||
+rm -f tests/permissions-{a,b}
|
||||
touch tests/permissions-{a,b}
|
||||
check_gold 0 gold-permissions-same.txt tests/permissions-{a,b} -P --cols=80
|
||||
|
||||
@@ -173,7 +173,7 @@ check_gold 1 gold-permissions-diff-text.txt tests/permissions-{a,b} -P --cols=80
|
||||
|
||||
echo -e "\04" >> tests/permissions-b
|
||||
check_gold 1 gold-permissions-diff-binary.txt tests/permissions-{a,b} -P --cols=80
|
||||
-rm tests/permissions-{a,b}
|
||||
+rm -f tests/permissions-{a,b}
|
||||
|
||||
if git show 4e86205629 &> /dev/null; then
|
||||
# We're in the repo, so test git.
|
||||
@@ -209,7 +209,7 @@ function ensure_installed() {
|
||||
|
||||
ensure_installed "black"
|
||||
echo 'Running black formatter...'
|
||||
-if ! black icdiff --line-length 79 --check; then
|
||||
+if ! black icdiff --quiet --line-length 79 --check; then
|
||||
echo ""
|
||||
echo 'Consider running `black icdiff --line-length 79`'
|
||||
fail
|
||||
diff --git a/tests/gold-exit-process-sub b/tests/gold-exit-process-sub
|
||||
index 3885e20..e69de29 100644
|
||||
--- a/tests/gold-exit-process-sub
|
||||
+++ b/tests/gold-exit-process-sub
|
||||
@@ -1 +0,0 @@
|
||||
-[0;34mtests/input-1.txt[m [0;34m/dev/fd/63[m
|
||||
Reference in New Issue
Block a user