diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-11-17 01:35:26 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-11-17 02:26:54 +0100 |
| commit | 016f80ae2106c2b1b5bca08a684b0bd082e231e6 (patch) | |
| tree | 66603a0b803147fe26fafc060f82a5e9cc7ff68a | |
| parent | 5875a6b44618fb7dfd5cd6d742533eaee2014060 (diff) | |
abi-check.sh: fix false postive ABI error, and display output error log
There is currently a false positive ABI check failure between v2.3.1
and current. It disappears when removing the generated reports of v2.3.1
and recreating them. It is likely that some tooling has evolved since
the initial v2.3.1 report generation.
| -rwxr-xr-x | tools/travis-ci/abi-check.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/travis-ci/abi-check.sh b/tools/travis-ci/abi-check.sh index f86c7028..4c0a8387 100755 --- a/tools/travis-ci/abi-check.sh +++ b/tools/travis-ci/abi-check.sh @@ -95,6 +95,12 @@ else fi cp -rf ${OPJ_SOURCE_DIR} src/openjpeg/current abi-monitor -v current -build openjpeg.json + +rm -rf ./installed/openjpeg/${OPJ_LATEST_VERSION} +rm -rf ./compat_report/openjpeg/${OPJ_LATEST_VERSION} +rm -rf ./abi_dump/openjpeg/${OPJ_LATEST_VERSION} +rm -rf ./headers_diff/openjpeg/${OPJ_LATEST_VERSION} +rm -rf ./objects_report/openjpeg/${OPJ_LATEST_VERSION} abi-monitor -v ${OPJ_LATEST_VERSION} -build openjpeg.json if [ "${OPJ_PREVIOUS_VERSION:-}" != "" ]; then abi-monitor -v ${OPJ_PREVIOUS_VERSION} -build openjpeg.json @@ -112,6 +118,9 @@ fi # Check ABI if [ "${OPJ_LIMIT_ABI_BUILDS}" != "" ]; then abi-compliance-checker -l openjpeg -old $(find ./abi_dump/openjpeg/$OPJ_LATEST_VERSION -name '*.dump') -new $(find ./abi_dump/openjpeg/current -name '*.dump') -header openjpeg.h -abi -s || EXIT_CODE=1 + if [ ${EXIT_CODE} -eq 1 ]; then + cat "compat_reports/openjpeg/${OPJ_LATEST_VERSION}_to_current/abi_compat_report.html" + fi if [ "${OPJ_PREVIOUS_VERSION:-}" != "" ]; then abi-compliance-checker -l openjpeg -old $(find ./abi_dump/openjpeg/$OPJ_PREVIOUS_VERSION -name '*.dump') -new $(find ./abi_dump/openjpeg/$OPJ_LATEST_VERSION -name '*.dump') -header openjpeg.h -abi -s || EXIT_CODE=1 fi |