diff --git a/build-compare.spec b/build-compare.spec index fd3778b..a8b5e0d 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: 20220305T001156.c33e802 +Version: 20220306T121516.38e7800 Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/pkg-diff.sh b/pkg-diff.sh index 3ad9b36..a8080ff 100644 --- a/pkg-diff.sh +++ b/pkg-diff.sh @@ -968,16 +968,17 @@ check_single_file() elfdiff='elfdiff' fi fi - if test -n "$elfdiff" + if test -z "$elfdiff" then rm old/$file.objdump new/$file.objdump & return 1 fi watchdog_touch + elfdiff= ($OBJDUMP -d --no-show-raw-insn old/$file | filter_disasm | - sed -e "s,old/,," ; echo "${PIPESTATUS[@]}" > $file1 ) > old/$file.objdump & + sed -e "s,^old/[^:]\+,," ; echo "${PIPESTATUS[@]}" > $file1 ) > old/$file.objdump & ($OBJDUMP -d --no-show-raw-insn new/$file | filter_disasm | - sed -e "s,new/,," ; echo "${PIPESTATUS[@]}" > $file2 ) > new/$file.objdump & + sed -e "s,^new/[^:]\+,," ; echo "${PIPESTATUS[@]}" > $file2 ) > new/$file.objdump & wait read i < ${file1} pipestatus=( $i ) @@ -1004,6 +1005,7 @@ check_single_file() fi return 1 fi + elfdiff= diff --speed-large-files --unified \ --label "old $file (disasm)" \ --label "new $file (disasm)" \