stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8224145: Build compare script fails intermittently on test image native libraries

Browse Source 
Reviewed-by: tbell
This commit is contained in:
Erik Joelsson 2019-05-23 14:14:13 -07:00
parent a455bb486c
commit f7a69b417d
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
make/scripts/compare.sh
View File

@ -820,6 +820,9 @@ compare_bin_file() {
BIN_MSG="($BIN_MSG)"
DIFF_BIN=
fi
else
BIN_MSG=
DIFF_BIN=
fi
if [ -n "$STAT" ]; then
@ -1571,15 +1574,12 @@ if [ "$CMP_LIBS" = "true" ]; then
fi
if [ -n "$THIS_TEST" ] && [ -n "$OTHER_TEST" ]; then
echo -n "Test "
# Test native libs are never stripped so will not compare well.
SKIP_BIN_DIFF="true"
ACCEPTED_SMALL_SIZE_DIFF_bak="$ACCEPTED_SMALL_SIZE_DIFF"
if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
ACCEPTED_SMALL_SIZE_DIFF="true"
STRIP_ALL_bak="$STRIP_ALL"
if [ "$STRIP_TESTS_BEFORE_COMPARE" = "true" ]; then
STRIP_ALL="true"
fi
compare_all_libs $THIS_TEST $OTHER_TEST $COMPARE_ROOT/test
SKIP_BIN_DIFF="false"
ACCEPTED_SMALL_SIZE_DIFF="$ACCEPTED_SMALL_SIZE_DIFF_bak"
STRIP_ALL="$STRIP_ALL_bak"
fi
if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
compare_all_libs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
@ -1593,10 +1593,12 @@ if [ "$CMP_EXECS" = "true" ]; then
fi
if [ -n "$THIS_TEST" ] && [ -n "$OTHER_TEST" ]; then
echo -n "Test "
# Test native executables are never stripped so will not compare well.
SKIP_BIN_DIFF="true"
STRIP_ALL_bak="$STRIP_ALL"
if [ "$STRIP_TESTS_BEFORE_COMPARE" = "true" ]; then
STRIP_ALL="true"
fi
compare_all_execs $THIS_TEST $OTHER_TEST $COMPARE_ROOT/test
SKIP_BIN_DIFF="false"
STRIP_ALL="$STRIP_ALL_bak"
fi
if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
compare_all_execs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir

5
make/scripts/compare_exceptions.sh.incl
View File

@ -40,6 +40,9 @@ if [ "$OPENJDK_TARGET_OS" = "linux" ]; then
./lib/server/libjvm.so
./hotspot/gtest/server/libjvm.so
"
STRIP_BEFORE_COMPARE="
./hotspot/gtest/server/libjvm.so
"
elif [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
SKIP_BIN_DIFF="true"
SKIP_FULLDUMP_DIFF="true"
@ -56,6 +59,7 @@ elif [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
./lib/libfontmanager.so
./lib/libsaproc.so
"
STRIP_TESTS_BEFORE_COMPARE="true"
elif [ "$OPENJDK_TARGET_OS" = "windows" ]; then
SKIP_BIN_DIFF="true"
SKIP_FULLDUMP_DIFF="true"
@ -72,4 +76,5 @@ elif [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
./lib/server/libjvm.dylib
./hotspot/gtest/server/libjvm.dylib
"
STRIP_TESTS_BEFORE_COMPARE="true"
fi