commit:     d45de09450ffb63b138bbb7f78cae43e1101e2ec
Author:     Ryan Hill <rhill <AT> gentoo <DOT> org>
AuthorDate: Wed May 13 04:09:28 2015 +0000
Commit:     Ryan Hill <rhill <AT> gentoo <DOT> org>
CommitDate: Wed May 13 04:09:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-config.git/commit/?id=d45de094

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 <tka <AT> kamph.org>
Signed-off-by: Ryan Hill <rhill <AT> 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}

Reply via email to