Mercurial > hg > openjdk > jigsaw
changeset 614:2597feac57c0
8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
Reviewed-by: tbell
author | erikj |
---|---|
date | Fri, 04 Jan 2013 22:43:13 +0100 |
parents | 7b9c42f14281 |
children | 5cf7750c8c43 |
files | common/bin/compare.sh common/bin/compare_exceptions.sh.incl |
diffstat | 2 files changed, 21 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/common/bin/compare.sh Fri Jan 04 17:08:33 2013 +0100 +++ b/common/bin/compare.sh Fri Jan 04 22:43:13 2013 +0100 @@ -1166,14 +1166,25 @@ 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 -THIS_SEC_BIN="$THIS/images/sec-bin.zip" +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 ########################################################################################## # Do the work
--- a/common/bin/compare_exceptions.sh.incl Fri Jan 04 17:08:33 2013 +0100 +++ b/common/bin/compare_exceptions.sh.incl Fri Jan 04 22:43:13 2013 +0100 @@ -807,6 +807,10 @@ 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