From e7fc87b21ed9a3f193e750d24371c47615689831 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Thu, 26 Nov 2020 20:19:15 +0100 Subject: travis/install.sh: make it robust to objdump on 20.04 and/or clang outputing symbols in different order --- travis/install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'travis') diff --git a/travis/install.sh b/travis/install.sh index 8897f823..a4d8352a 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -41,8 +41,9 @@ make >/dev/null if [ "$(uname)" == "Linux" -a -f src/.libs/libproj.so ]; then if objdump -TC "src/.libs/libproj.so" | grep "elf64-x86-64">/dev/null; then echo "Checking exported symbols..." - $TRAVIS_BUILD_DIR/scripts/dump_exported_symbols.sh src/.libs/libproj.so > /tmp/got_symbols.txt - diff -u $TRAVIS_BUILD_DIR/scripts/reference_exported_symbols.txt /tmp/got_symbols.txt || (echo "Difference(s) found in exported symbols. If intended, refresh scripts/reference_exported_symbols.txt with 'scripts/dump_exported_symbols.sh src/.libs/libproj.so > scripts/reference_exported_symbols.txt'"; exit 1) + cat $TRAVIS_BUILD_DIR/scripts/reference_exported_symbols.txt | sort > /tmp/reference_exported_symbols.txt + $TRAVIS_BUILD_DIR/scripts/dump_exported_symbols.sh src/.libs/libproj.so | sort > /tmp/got_symbols.txt + diff -u /tmp/reference_exported_symbols.txt /tmp/got_symbols.txt || (echo "Difference(s) found in exported symbols. If intended, refresh scripts/reference_exported_symbols.txt with 'scripts/dump_exported_symbols.sh src/.libs/libproj.so > scripts/reference_exported_symbols.txt'"; exit 1) fi fi -- cgit v1.2.3