diff --git a/build-compare.changes b/build-compare.changes index 6775c19..396d667 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 13 13:13:13 UTC 2022 - olaf@aepfle.de + +- fix objdump parsing (#52) + ------------------------------------------------------------------- Fri Mar 4 12:34:56 UTC 2022 - olaf@aepfle.de @@ -216,7 +221,7 @@ Thu Jan 5 11:01:53 UTC 2017 - olaf@aepfle.de ------------------------------------------------------------------- Wed Dec 14 08:44:11 UTC 2016 - olaf@aepfle.de -- Remove warning about python mtime mismatch, a republish will not help +- Remove warning about python mtime mismatch, a republish will not help (bsc#915948) - Handle yet another variant of numbered anchor in html file ------------------------------------------------------------------- diff --git a/build-compare.spec b/build-compare.spec index 54fcbc5..3008db3 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: 20220307T115648.b5abdde +Version: 20220613T135442.472ee09 Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/pkg-diff.sh b/pkg-diff.sh index e208d0a..74f16fe 100644 --- a/pkg-diff.sh +++ b/pkg-diff.sh @@ -933,25 +933,17 @@ check_single_file() p } ')) - ($OBJDUMP -s ${sections[@]} old/$file | - sed -e "s,old/,," ; echo "${PIPESTATUS[@]}" > $file1 ) > old/$file.objdump & - ($OBJDUMP -s ${sections[@]} new/$file | - sed -e "s,new/,," ; echo "${PIPESTATUS[@]}" > $file2 ) > new/$file.objdump & + (cd old && exec $OBJDUMP -s ${sections[@]} ./$file ) > old/$file.objdump & + (cd new && exec $OBJDUMP -s ${sections[@]} ./$file ) > new/$file.objdump & wait - read i < ${file1} - pipestatus=( $i ) - objdump_failed="${pipestatus[0]}" - if [[ ${pipestatus[*]} =~ [1-9] ]] + if ! test -s old/$file.objdump then - wprint "ELF section: pipe command failed for old/$file" + wprint "ELF section: objdump failed for old/$file" elfdiff='failed' fi - read i < ${file2} - pipestatus=( $i ) - objdump_failed="${objdump_failed}${pipestatus[0]}" - if [[ ${pipestatus[*]} =~ [1-9] ]] + if ! test -s new/$file.objdump then - wprint "ELF section: pipe command failed for new/$file" + wprint "ELF section: objdump failed for new/$file" elfdiff='failed' fi if test -z "${elfdiff}" @@ -975,10 +967,10 @@ check_single_file() fi watchdog_touch elfdiff= - ($OBJDUMP -d --no-show-raw-insn old/$file | filter_disasm | - 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 & + (cd old && exec $OBJDUMP -d --no-show-raw-insn ./$file | filter_disasm + echo "${PIPESTATUS[@]}" > $file1 ) > old/$file.objdump & + (cd new && exec $OBJDUMP -d --no-show-raw-insn ./$file | filter_disasm + echo "${PIPESTATUS[@]}" > $file2 ) > new/$file.objdump & wait read i < ${file1} pipestatus=( $i )