testing/build-compare
SHA256
3
0
Fork 0
forked from pool/build-compare
Code Pull Requests Activity

Accepting request 46512 from home:a_jaeger:branches:build-compare-test

Browse Source 
Copy from home:a_jaeger:branches:build-compare-test/build-compare via accept of submit request 46512 revision 33.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/46512
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=73
This commit is contained in:
Andreas Jaeger 2010-08-29 08:12:19 +00:00 committed by Git OBS Bridge
parent 57861b39d6
commit 63216b2331
3 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build-compare.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Fri Aug 27 08:59:22 UTC 2010 - aj@suse.de
- Handle png files with timestamp if convert is installed.
-------------------------------------------------------------------
Fri Aug 27 06:50:13 UTC 2010 - aj@suse.de
- Handle one more doxygen variation.
-------------------------------------------------------------------
Sun May 23 12:19:56 UTC 2010 - aj@suse.de
- Release is at end of line, avoid wrong matches.
-------------------------------------------------------------------
Fri May 21 21:46:47 UTC 2010 - cmorve69@yahoo.es
- Improved ELF executable detection (bnc#604049).
-------------------------------------------------------------------
Thu May 20 08:23:52 UTC 2010 - aj@suse.de

2
build-compare.spec
View File

@ -24,7 +24,7 @@ Group: Development/Tools/Building
AutoReqProv: on
Summary: Build Result Compare Script
Version: 2009.10.14
Release: 13
Release: 14
Source: same-build-result.sh
Source1: rpm-check.sh
Source2: COPYING

21
rpm-check.sh
View File

@ -159,7 +159,7 @@ check_provides()
QF="$QF [%{REQUIRENAME} %{REQUIREFLAGS} %{REQUIREVERSION}\\n]\\n"
QF="$QF [%{CONFLICTNAME} %{CONFLICTFLAGS} %{CONFLICTVERSION}\\n]\\n"
QF="$QF [%{OBSOLETENAME} %{OBSOLETEFLAGS} %{OBSOLETEVERSION}\\n]\\n"
check_header "$1" | sed -e "s,-$2,-@RELEASE@,"
check_header "$1" | sed -e "s,-$2$,-@RELEASE@,"
}
check_provides $oldrpm $release1 > $file1
@ -327,6 +327,21 @@ check_single_file()
check_single_file ${file/.gz/}
return $?
;;
*png)
# Try to remove timestamps, only if convert from ImageMagick is installed
if [[ $(type -p convert) ]]; then
convert old/$file +set date:create +set date:modify old/${file/.png/_n.png}
convert old/$file +set date:create +set date:modify new/${file/.png/_n.png}
if ! cmp -s old/${file/.png/_n.png} new/${file/.png/_n.png}; then
echo "$file differs ($ftype)"
hexdump -C old/${file/.png/_n.png} > $file1
hexdump -C new/${file/.png/_n.png} > $file2
diff -u $file1 $file2 | head -n 20
return 1
fi
return 0
fi
;;
/usr/share/locale/*/LC_MESSAGES/*.mo|/usr/share/locale-bundle/*/LC_MESSAGES/*.mo)
for f in old/$file new/$file; do
sed -i -e "s,POT-Creation-Date: ....-..-.. ..:..+....,POT-Creation-Date: 1970-01-01 00:00+0000," $f
@ -339,6 +354,8 @@ check_single_file()
sed -i -e 's|^ *This document was generated by <em>Autobuild</em> on <em>.*, 20..</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html .\...</em></a>.$| This document was generated by <em>Autobuild</em> on <em>August 7, 2009</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.82</em></a>.|' $f
# doxygen docu, e.g. in libssh and log4c
sed -i -e 's|Generated on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] 20[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f
# Generated on Sat Aug 14 2010 16:49:48 for libssh
sed -i -e 's|Generated on ... ... [0-9]* 20[0-9][0-9] [0-9]*:[0-9][0-9]:[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f
done
;;
/usr/share/javadoc/*.html |\
@ -462,7 +479,7 @@ check_single_file()
return 1
fi
;;
*executable*|*LSB\ shared\ object*)
*ELF*executable*|*ELF*LSB\ shared\ object*)
objdump -d --no-show-raw-insn old/$file | filter_disasm > $file1
if ! test -s $file1; then
# objdump has no idea how to handle it