fix ELF comparision to really show disasm output

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=289
This commit is contained in:
Olaf Hering 2022-03-06 11:17:34 +00:00 committed by Git OBS Bridge
parent 714195e1eb
commit 107f5e6e1c
2 changed files with 6 additions and 4 deletions

View File

@ -21,7 +21,7 @@ Summary: Build Result Compare Script
License: GPL-2.0+ License: GPL-2.0+
Group: Development/Tools/Building Group: Development/Tools/Building
Url: https://github.com/openSUSE/build-compare Url: https://github.com/openSUSE/build-compare
Version: 20220305T001156.c33e802 Version: 20220306T121516.38e7800
Release: 0 Release: 0
Source1: COPYING Source1: COPYING
Source2: same-build-result.sh Source2: same-build-result.sh

View File

@ -968,16 +968,17 @@ check_single_file()
elfdiff='elfdiff' elfdiff='elfdiff'
fi fi
fi fi
if test -n "$elfdiff" if test -z "$elfdiff"
then then
rm old/$file.objdump new/$file.objdump & rm old/$file.objdump new/$file.objdump &
return 1 return 1
fi fi
watchdog_touch watchdog_touch
elfdiff=
($OBJDUMP -d --no-show-raw-insn old/$file | filter_disasm | ($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 | ($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 wait
read i < ${file1} read i < ${file1}
pipestatus=( $i ) pipestatus=( $i )
@ -1004,6 +1005,7 @@ check_single_file()
fi fi
return 1 return 1
fi fi
elfdiff=
diff --speed-large-files --unified \ diff --speed-large-files --unified \
--label "old $file (disasm)" \ --label "old $file (disasm)" \
--label "new $file (disasm)" \ --label "new $file (disasm)" \