vapier 15/08/05 08:10:59
Modified:
gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch
Log:
Include fix from git for test output #547586.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
D2E96200)
Revision Changes Path
1.2
sys-devel/gcc-config/files/gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch?r1=1.1&r2=1.2
Index: gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch 24 Apr
2015 07:38:48 -0000 1.1
+++ gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch 5 Aug
2015 08:10:59 -0000 1.2
@@ -12,3 +12,36 @@
exit 1
}
esyslog() { :; }
+
+From d45de09450ffb63b138bbb7f78cae43e1101e2ec Mon Sep 17 00:00:00 2001
+From: Ryan Hill <rh...@gentoo.org>
+Date: Tue, 12 May 2015 22:09:28 -0600
+Subject: [PATCH] Ignore whitespace when diffing test results.
+
+The amount of whitespace output by ebegin/eend from gentoo-functions
+is dynamic (seems to be dependent on terminal width). Since we can't
+predict this we have to ignore all whitespace differences.
+
+URL: https://bugs.gentoo.org/547586
+Reported-by: tka <t...@kamph.org>
+Signed-off-by: Ryan Hill <rh...@gentoo.org>
+---
+ tests/run_tests | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/run_tests b/tests/run_tests
+index 2ff7d77..397d667 100755
+--- a/tests/run_tests
++++ b/tests/run_tests
+@@ -44,7 +44,7 @@ cmp_log() {
+ args+=( -e "s|: line [0-9]*: |: |g" )
+ sed "${args[@]}" "${exp}" > "${exp}.tmp"
+ sed "${args[@]}" "${log}" > "${log}.tmp"
+- diff -u "${exp}.tmp" "${log}.tmp" > "${log}.diff"
++ diff -uw "${exp}.tmp" "${log}.tmp" > "${log}.diff"
+ ret=$?
+ rm "${exp}.tmp"
+ return ${ret}
+--
+2.4.4
+
