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

8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing

Browse Source 
Reviewed-by: tbell
This commit is contained in:
Erik Joelsson 2013-01-04 22:43:13 +01:00
parent e92b3e716e
commit 174782e022
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/bin/compare.sh
View File

@ -1166,14 +1166,25 @@ if [ -z "$OTHER_DOCS" ]; then
echo "WARNING! Other build doesn't contain docs, skipping doc compare."
fi
if [ -f "$OTHER/tmp/sec-bin.zip" ]; then
OTHER_SEC_BIN="$OTHER/tmp/sec-bin.zip"
elif [ -f "$OTHER/images/sec-bin.zip" ]; then
OTHER_SEC_BIN="$OTHER/tmp/sec-bin.zip"
if [ -d "$OTHER/images" ]; then
OTHER_SEC_DIR="$OTHER/images"
else
echo "WARNING! No sec-bin.zip found in other."
OTHER_SEC_DIR="$OTHER/tmp"
fi
OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip"
THIS_SEC_DIR="$THIS/images"
THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip"
if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip"
else
JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip"
fi
OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip"
OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN"
THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip"
THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN"
fi
THIS_SEC_BIN="$THIS/images/sec-bin.zip"
##########################################################################################
# Do the work

4
common/bin/compare_exceptions.sh.incl
View File

@ -807,6 +807,10 @@ fi
if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
ACCEPTED_JARZIP_CONTENTS="
/bin/w2k_lsa_auth.dll
"
# Probably should add all libs here
ACCEPTED_SMALL_SIZE_DIFF="
./demo/jvmti/gctest/lib/gctest.dll