From 89292ec82a0fbaf67b4b895401af14d172d4f58be8a0fb2b0d7e51753d5a9606 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Wed, 12 Oct 2016 14:46:18 +0000 Subject: [PATCH 1/2] - pkg-diff.sh: use option --speed-large-files for diffing disassembler output OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=221 --- build-compare.changes | 6 ++++++ build-compare.spec | 2 +- pkg-diff.sh | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 949c956..ffcdb53 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 12 16:40:24 CEST 2016 - ro@suse.de + +- pkg-diff.sh: use option --speed-large-files for diffing + disassembler output + ------------------------------------------------------------------- Wed Sep 21 07:18:37 UTC 2016 - olaf@aepfle.de diff --git a/build-compare.spec b/build-compare.spec index ad1bb5f..7f92716 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -21,7 +21,7 @@ Summary: Build Result Compare Script License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/build-compare -Version: 20160921T091855.efc253f +Version: 20161012T163739.10c9ac7 Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/pkg-diff.sh b/pkg-diff.sh index cfe4a0b..4404967 100644 --- a/pkg-diff.sh +++ b/pkg-diff.sh @@ -746,7 +746,7 @@ check_single_file() monodis new/$file 2>/dev/null|sed -e 's/GUID = {.*}/GUID = { 42 }/;'> ${file2} if ! cmp -s ${file1} ${file2}; then echo "$file differs ($ftype)" - diff -u ${file1} ${file2} + diff --speed-large-files -u ${file1} ${file2} return 1 fi else @@ -770,7 +770,7 @@ check_single_file() sed -i -e "s,old/,," $file1 sed -i -e "s,new/,," $file2 elfdiff= - if ! diff -u $file1 $file2 > $dfile; then + if ! diff --speed-large-files -u $file1 $file2 > $dfile; then echo "$file differs in assembler output" head -n 200 $dfile elfdiff="1" From ffacc63baba1d01503f4ceaba67e7edf274ffb32731a14174eeedf793f252069 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Wed, 12 Oct 2016 14:51:56 +0000 Subject: [PATCH 2/2] disassembler output (bsc#1003528) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=222 --- build-compare.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-compare.changes b/build-compare.changes index ffcdb53..8eba5c9 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -2,7 +2,7 @@ Wed Oct 12 16:40:24 CEST 2016 - ro@suse.de - pkg-diff.sh: use option --speed-large-files for diffing - disassembler output + disassembler output (bsc#1003528) ------------------------------------------------------------------- Wed Sep 21 07:18:37 UTC 2016 - olaf@aepfle.de