Accepting request 100864 from home:a_jaeger:branches:build-compare-test
Sort rpmlint.log files first. OBS-URL: https://build.opensuse.org/request/show/100864 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=111
This commit is contained in:
parent
3dc4404c71
commit
0501533367
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 20 08:49:39 UTC 2012 - aj@suse.de
|
||||
|
||||
- Sort rpmlint.log files first since the order is non-deterministic.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 12 12:59:31 UTC 2012 - aj@suse.de
|
||||
|
||||
|
@ -90,11 +90,16 @@ RPMLINTDIR=/home/abuild/rpmbuild/OTHER
|
||||
|
||||
if test -e $OLDDIR/rpmlint.log -a -e $RPMLINTDIR/rpmlint.log; then
|
||||
echo "comparing $OLDDIR/rpmlint.log and $RPMLINTDIR/rpmlint.log"
|
||||
if ! cmp -s $OLDDIR/rpmlint.log $RPMLINTDIR/rpmlint.log; then
|
||||
# Sort the files first since the order of messages is not deterministic
|
||||
sort -u $OLDDIR/rpmlint.log > $OLDDIR/rpmlint.log.sorted
|
||||
sort -u $RPMLINTDIR/rpmlint.log > $RPMLINTDIR/rpmlint.log.sorted
|
||||
if ! cmp -s $OLDDIR/rpmlint.log.sorted $RPMLINTDIR/rpmlint.log.sorted; then
|
||||
echo "rpmlint.log files differ:"
|
||||
diff -u $OLDDIR/rpmlint.log $RPMLINTDIR/rpmlint.log|head -n 20
|
||||
rm $OLDDIR/rpmlint.log.sorted $RPMLINTDIR/rpmlint.log.sorted
|
||||
exit 1
|
||||
fi
|
||||
rm $OLDDIR/rpmlint.log.sorted $RPMLINTDIR/rpmlint.log.sorted
|
||||
fi
|
||||
|
||||
if test $SUCCESS -eq 0; then
|
||||
|
Loading…
Reference in New Issue
Block a user