Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1366761, address review comments from Martin Thomson
DONTBUILD

--HG--
extra : amend_source : 7a1971882294be55e15f843430a987eaa0ae8d96
  • Loading branch information
kaie committed May 23, 2017
1 parent d117a36 commit 7baf596
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions automation/buildbot-slave/build.sh
Expand Up @@ -224,28 +224,21 @@ check_abi()
print_log "######## NSS ABI CHECK - ${BITS} bits - ${OPT} ########"
rm -rf ${HGDIR}/baseline
mkdir ${HGDIR}/baseline
hg clone ${HGDIR}/nspr ${HGDIR}/baseline/nspr
hg clone ${HGDIR}/nss ${HGDIR}/baseline/nss
BASE_PR=`cat ${HGDIR}/nss/automation/abi-check/previous-nspr-release`
BASE_S=`cat ${HGDIR}/nss/automation/abi-check/previous-nss-release`
BASE_NSPR=`cat ${HGDIR}/nss/automation/abi-check/previous-nspr-release`
BASE_NSS=`cat ${HGDIR}/nss/automation/abi-check/previous-nss-release`

print_log "######## creating temporary HG clones ########"

cd ${HGDIR}/baseline/nspr
hg update $BASE_PR
hg clone -u "${BASE_NSPR}" "${HGDIR}/nspr" "${HGDIR}/baseline/nspr"
if [ $? -ne 0 ]; then
echo "invalid tag in automation/abi-check/previous-nspr-release"
return 1
fi
cd ../..

cd ${HGDIR}/baseline/nss
hg update $BASE_S
hg clone -u "${BASE_NSS}" "${HGDIR}/nss" "${HGDIR}/baseline/nss"
if [ $? -ne 0 ]; then
echo "invalid tag in automation/abi-check/previous-nss-release"
return 1
fi
cd ../..

print_log "######## building older NSPR/NSS ########"

Expand Down Expand Up @@ -281,7 +274,7 @@ check_abi()
diff -u nss/automation/abi-check/expected-report-$SO.txt \
nss/automation/abi-check/new-report-$SO.txt >> ${ABI_REPORT}
done

if [ -s ${ABI_REPORT} ]; then
print_log "FAILED: there are new unexpected ABI changes"
cat ${ABI_REPORT}
Expand Down

0 comments on commit 7baf596

Please sign in to comment.