1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/common/bin/compare.sh Fri Oct 26 14:29:57 2012 -0700
1.3 @@ -0,0 +1,1220 @@
1.4 +#!/bin/bash
1.5 +#
1.6 +# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
1.7 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 +#
1.9 +# This code is free software; you can redistribute it and/or modify it
1.10 +# under the terms of the GNU General Public License version 2 only, as
1.11 +# published by the Free Software Foundation.
1.12 +#
1.13 +# This code is distributed in the hope that it will be useful, but WITHOUT
1.14 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
1.15 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
1.16 +# version 2 for more details (a copy is included in the LICENSE file that
1.17 +# accompanied this code).
1.18 +#
1.19 +# You should have received a copy of the GNU General Public License version
1.20 +# 2 along with this work; if not, write to the Free Software Foundation,
1.21 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
1.22 +#
1.23 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
1.24 +# or visit www.oracle.com if you need additional information or have any
1.25 +# questions.
1.26 +#
1.27 +
1.28 +# This script is processed by configure before it's usable. It is run from
1.29 +# the root of the build directory.
1.30 +
1.31 +
1.32 +##########################################################################################
1.33 +
1.34 +# Check that we are run via the wrapper generated by configure
1.35 +if [ -z "$SRC_ROOT" ]; then
1.36 + echo "Error: You must run this script using build/[conf]/compare.sh"
1.37 + exit 1
1.38 +fi
1.39 +
1.40 +if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
1.41 + FULLDUMP_CMD="$OTOOL -v -V -h -X -t -d"
1.42 + LDD_CMD="$OTOOL -L"
1.43 + DIS_CMD="$OTOOL -v -t"
1.44 + STAT_PRINT_SIZE="-f %z"
1.45 +elif [ "$OPENJDK_TARGET_OS" = "windows" ]; then
1.46 + FULLDUMP_CMD="$DUMPBIN -all"
1.47 + LDD_CMD="$DUMPBIN -dependants | $GREP .dll"
1.48 + DIS_CMD="$DUMPBIN -disasm:nobytes"
1.49 + STAT_PRINT_SIZE="-c %s"
1.50 +else
1.51 + FULLDUMP_CMD="$READELF -a"
1.52 + LDD_CMD="$LDD"
1.53 + DIS_CMD="$OBJDUMP -d"
1.54 + STAT_PRINT_SIZE="-c %s"
1.55 +fi
1.56 +
1.57 +UNARCHIVE="$UNZIP -q"
1.58 +
1.59 +COMPARE_EXCEPTIONS_INCLUDE="$SRC_ROOT/common/bin/compare_exceptions.sh.incl"
1.60 +if [ ! -e "$COMPARE_EXCEPTIONS_INCLUDE" ]; then
1.61 + echo "Error: Cannot locate the exceptions file, it should have been here: $COMPARE_EXCEPTIONS_INCLUDE"
1.62 + exit 1
1.63 +fi
1.64 +# Include exception definitions
1.65 +. "$COMPARE_EXCEPTIONS_INCLUDE"
1.66 +
1.67 +##########################################################################################
1.68 +# Compare text files and ignore specific differences:
1.69 +#
1.70 +# * Timestamps in Java sources generated by idl2java
1.71 +# * Sorting order and cleanup style in .properties files
1.72 +
1.73 +diff_text() {
1.74 + OTHER_FILE=$1
1.75 + THIS_FILE=$2
1.76 +
1.77 + SUFFIX="${THIS_FILE##*.}"
1.78 +
1.79 + TMP=1
1.80 +
1.81 + if [[ "$THIS_FILE" = *"META-INF/MANIFEST.MF" ]]; then
1.82 + TMP=$(LANG=C $DIFF $OTHER_FILE $THIS_FILE | \
1.83 + $GREP '^[<>]' | \
1.84 + $SED -e '/[<>] Ant-Version: Apache Ant .*/d' \
1.85 + -e '/[<>] Created-By: .* (Oracle Corporation).*/d')
1.86 + fi
1.87 + if test "x$SUFFIX" = "xjava"; then
1.88 + TMP=$(LANG=C $DIFF $OTHER_FILE $THIS_FILE | \
1.89 + $GREP '^[<>]' | \
1.90 + $SED -e '/[<>] \* from.*\.idl/d' \
1.91 + -e '/[<>] \*.*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
1.92 + -e '/[<>] \*.*[0-9]\{4\} [0-9][0-9]*:[0-9]\{2\}:[0-9]\{2\}.*/d' \
1.93 + -e '/\/\/ Generated from input file.*/d' \
1.94 + -e '/\/\/ This file was generated AUTOMATICALLY from a template file.*/d' \
1.95 + -e '/\/\/ java GenerateCharacter.*/d')
1.96 + fi
1.97 + # Ignore date strings in class files.
1.98 + # On Macosx the system sources for generated java classes produce different output on
1.99 + # consequtive invokations seemingly randomly.
1.100 + # For example a method parameter randomly named "thePoint" or "aPoint". Ignore this.
1.101 + if test "x$SUFFIX" = "xclass"; then
1.102 + # To improve performance when large diffs are found, do a rough filtering of classes
1.103 + # elibeble for these exceptions
1.104 + if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' -e thePoint -e aPoint -e setItemsPtr ${THIS_FILE} > /dev/null; then
1.105 + $JAVAP -c -constants -l -p ${OTHER_FILE} > ${OTHER_FILE}.javap
1.106 + $JAVAP -c -constants -l -p ${THIS_FILE} > ${THIS_FILE}.javap
1.107 + TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \
1.108 + $GREP '^[<>]' | \
1.109 + $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
1.110 + -e '/[<>].*Point Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \
1.111 + -e '/[<>].*public com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*itemsPtr();/d' \
1.112 + -e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d')
1.113 + fi
1.114 + fi
1.115 + if test "x$SUFFIX" = "xproperties"; then
1.116 + $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
1.117 + | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \
1.118 + | $SED -e '/^#/d' -e '/^$/d' \
1.119 + -e :a -e '/\\$/N; s/\\\n//; ta' \
1.120 + -e 's/^[ \t]*//;s/[ \t]*$//' \
1.121 + -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned
1.122 + TMP=$(LANG=C $DIFF $OTHER_FILE.cleaned $THIS_FILE)
1.123 + fi
1.124 + if test -n "$TMP"; then
1.125 + echo Files $OTHER_FILE and $THIS_FILE differ
1.126 + return 1
1.127 + fi
1.128 +
1.129 + return 0
1.130 +}
1.131 +
1.132 +##########################################################################################
1.133 +# Compare directory structure
1.134 +
1.135 +compare_dirs() {
1.136 + THIS_DIR=$1
1.137 + OTHER_DIR=$2
1.138 + WORK_DIR=$3
1.139 +
1.140 + mkdir -p $WORK_DIR
1.141 +
1.142 + (cd $OTHER_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_other)
1.143 + (cd $THIS_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_this)
1.144 +
1.145 + $DIFF $WORK_DIR/dirs_other $WORK_DIR/dirs_other > $WORK_DIR/dirs_diff
1.146 +
1.147 + echo -n Directory structure...
1.148 + if [ -s $WORK_DIR/dirs_diff ]; then
1.149 + echo Differences found.
1.150 + REGRESSIONS=true
1.151 + # Differences in directories found.
1.152 + ONLY_OTHER=$($GREP '<' $WORK_DIR/dirs_diff)
1.153 + if [ "$ONLY_OTHER" ]; then
1.154 + echo Only in $OTHER
1.155 + $GREP '<' $WORK_DIR/dirs_diff | $SED 's|< ./| |g'
1.156 + fi
1.157 + ONLY_THIS=$($GREP '>' $WORK_DIR/dirs_diff)
1.158 + if [ "$ONLY_THIS" ]; then
1.159 + echo Only in $THIS
1.160 + $GREP '>' $WORK_DIR/dirs_diff | $SED 's|> ./| |g'
1.161 + fi
1.162 + else
1.163 + echo Identical!
1.164 + fi
1.165 +}
1.166 +
1.167 +
1.168 +##########################################################################################
1.169 +# Compare file structure
1.170 +
1.171 +compare_files() {
1.172 + THIS_DIR=$1
1.173 + OTHER_DIR=$2
1.174 + WORK_DIR=$3
1.175 +
1.176 + $MKDIR -p $WORK_DIR
1.177 +
1.178 + (cd $OTHER_DIR && $FIND . ! -type d | $SORT > $WORK_DIR/files_other)
1.179 + (cd $THIS_DIR && $FIND . ! -type d | $SORT > $WORK_DIR/files_this)
1.180 +
1.181 + $DIFF $WORK_DIR/files_other $WORK_DIR/files_this > $WORK_DIR/files_diff
1.182 +
1.183 + echo -n File names...
1.184 + if [ -s $WORK_DIR/files_diff ]; then
1.185 + echo Differences found.
1.186 + REGRESSIONS=true
1.187 + # Differences in files found.
1.188 + ONLY_OTHER=$($GREP '<' $WORK_DIR/files_diff)
1.189 + if [ "$ONLY_OTHER" ]; then
1.190 + echo Only in $OTHER
1.191 + $GREP '<' $WORK_DIR/files_diff | $SED 's|< ./| |g'
1.192 + fi
1.193 + ONLY_THIS=$($GREP '>' $WORK_DIR/files_diff)
1.194 + if [ "$ONLY_THIS" ]; then
1.195 + echo Only in $THIS
1.196 + $GREP '>' $WORK_DIR/files_diff | $SED 's|> ./| |g'
1.197 + fi
1.198 + else
1.199 + echo Identical!
1.200 + fi
1.201 +}
1.202 +
1.203 +
1.204 +##########################################################################################
1.205 +# Compare permissions
1.206 +
1.207 +compare_permissions() {
1.208 + THIS_DIR=$1
1.209 + OTHER_DIR=$2
1.210 + WORK_DIR=$3
1.211 +
1.212 + mkdir -p $WORK_DIR
1.213 +
1.214 + echo -n Permissions...
1.215 + found=""
1.216 + for f in `cd $OTHER_DIR && $FIND . -type f`
1.217 + do
1.218 + if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi
1.219 + if [ ! -f ${THIS_DIR}/$f ]; then continue; fi
1.220 + OP=`ls -l ${OTHER_DIR}/$f | awk '{printf("%.10s\n", $1);}'`
1.221 + TP=`ls -l ${THIS_DIR}/$f | awk '{printf("%.10s\n", $1);}'`
1.222 + if [ "$OP" != "$TP" ]
1.223 + then
1.224 + if [ -z "$found" ]; then echo ; found="yes"; fi
1.225 + $PRINTF "\told: ${OP} new: ${TP}\t$f\n"
1.226 + fi
1.227 + done
1.228 + if [ -z "$found" ]; then
1.229 + echo "Identical!"
1.230 + else
1.231 + REGRESSIONS=true
1.232 + fi
1.233 +}
1.234 +
1.235 +##########################################################################################
1.236 +# Compare file command output
1.237 +
1.238 +compare_file_types() {
1.239 + THIS_DIR=$1
1.240 + OTHER_DIR=$2
1.241 + WORK_DIR=$3
1.242 +
1.243 + $MKDIR -p $WORK_DIR
1.244 +
1.245 + echo -n File types...
1.246 + found=""
1.247 + for f in `cd $OTHER_DIR && $FIND . ! -type d`
1.248 + do
1.249 + if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi
1.250 + if [ ! -f ${THIS_DIR}/$f ]; then continue; fi
1.251 + OF=`cd ${OTHER_DIR} && $FILE -h $f`
1.252 + TF=`cd ${THIS_DIR} && $FILE -h $f`
1.253 + if [ "$f" = "./src.zip" ] || [[ "$f" = *"/Home/src.zip" ]] || [[ "$f" = *"/lib/JObjC.jar" ]]
1.254 + then
1.255 + if [ "`echo $OF | $GREP -ic zip`" -gt 0 -a "`echo $TF | $GREP -ic zip`" -gt 0 ]
1.256 + then
1.257 + # the way we produces zip-files make it so that directories are stored in old file
1.258 + # but not in new (only files with full-path)
1.259 + # this makes file-5.09 report them as different
1.260 + continue;
1.261 + fi
1.262 + fi
1.263 +
1.264 + if [ "$OF" != "$TF" ]
1.265 + then
1.266 + if [ -z "$found" ]; then echo ; found="yes"; fi
1.267 + $PRINTF "\tother: ${OF}\n\tthis : ${TF}\n"
1.268 + fi
1.269 + done
1.270 + if [ -z "$found" ]; then
1.271 + echo "Identical!"
1.272 + else
1.273 + REGRESSIONS=true
1.274 + fi
1.275 +}
1.276 +
1.277 +##########################################################################################
1.278 +# Compare the rest of the files
1.279 +
1.280 +compare_general_files() {
1.281 + THIS_DIR=$1
1.282 + OTHER_DIR=$2
1.283 + WORK_DIR=$3
1.284 +
1.285 + GENERAL_FILES=$(cd $THIS_DIR && $FIND . -type f ! -name "*.so" ! -name "*.jar" ! -name "*.zip" \
1.286 + ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" \
1.287 + ! -name "ct.sym" ! -name "*.diz" ! -name "*.dll" \
1.288 + ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \
1.289 + ! -name "*.lib" ! -name "*.war" \
1.290 + | $GREP -v "./bin/" | $SORT | $FILTER)
1.291 +
1.292 + echo General files...
1.293 + for f in $GENERAL_FILES
1.294 + do
1.295 + if [ -e $OTHER_DIR/$f ]; then
1.296 + if [ "$(basename $f)" = "release" ]; then
1.297 + # Ignore differences in change numbers in release file.
1.298 + OTHER_FILE=$WORK_DIR/$f.other
1.299 + THIS_FILE=$WORK_DIR/$f.this
1.300 + $MKDIR -p $(dirname $OTHER_FILE)
1.301 + $MKDIR -p $(dirname $THIS_FILE)
1.302 + $CAT $OTHER_DIR/$f | $SED 's/\:[0-9a-f]\{12,12\}/:CHANGE/g' > $OTHER_FILE
1.303 + $CAT $THIS_DIR/$f | $SED 's/\:[0-9a-f]\{12,12\}/:CHANGE/g' > $THIS_FILE
1.304 + else
1.305 + OTHER_FILE=$OTHER_DIR/$f
1.306 + THIS_FILE=$THIS_DIR/$f
1.307 + fi
1.308 + DIFF_OUT=$($DIFF $OTHER_FILE $THIS_FILE 2>&1)
1.309 + if [ -n "$DIFF_OUT" ]; then
1.310 + echo $f
1.311 + REGRESSIONS=true
1.312 + if [ "$SHOW_DIFFS" = "true" ]; then
1.313 + echo "$DIFF_OUT"
1.314 + fi
1.315 + fi
1.316 + fi
1.317 + done
1.318 +
1.319 +
1.320 +}
1.321 +
1.322 +##########################################################################################
1.323 +# Compare zip file
1.324 +
1.325 +compare_zip_file() {
1.326 + THIS_DIR=$1
1.327 + OTHER_DIR=$2
1.328 + WORK_DIR=$3
1.329 + ZIP_FILE=$4
1.330 +
1.331 + THIS_ZIP=$THIS_DIR/$ZIP_FILE
1.332 + OTHER_ZIP=$OTHER_DIR/$ZIP_FILE
1.333 +
1.334 + THIS_SUFFIX="${THIS_ZIP##*.}"
1.335 + OTHER_SUFFIX="${OTHER_ZIP##*.}"
1.336 + if [ "$THIS_SUFFIX" != "$OTHER_SUFFIX" ]; then
1.337 + echo The files do not have the same suffix type!
1.338 + return 2
1.339 + fi
1.340 +
1.341 + TYPE="$THIS_SUFFIX"
1.342 +
1.343 + if $CMP $OTHER_ZIP $THIS_ZIP > /dev/null
1.344 + then
1.345 + return 0
1.346 + fi
1.347 + # Not quite identical, the might still contain the same data.
1.348 + # Unpack the jar/zip files in temp dirs
1.349 +
1.350 + THIS_UNZIPDIR=$WORK_DIR/$ZIP_FILE.this
1.351 + OTHER_UNZIPDIR=$WORK_DIR/$ZIP_FILE.other
1.352 + $RM -rf $THIS_UNZIPDIR $OTHER_UNZIPDIR
1.353 + $MKDIR -p $THIS_UNZIPDIR
1.354 + $MKDIR -p $OTHER_UNZIPDIR
1.355 + (cd $THIS_UNZIPDIR && $UNARCHIVE $THIS_ZIP)
1.356 + (cd $OTHER_UNZIPDIR && $UNARCHIVE $OTHER_ZIP)
1.357 +
1.358 + CONTENTS_DIFF_FILE=$WORK_DIR/$ZIP_FILE.diff
1.359 + # On solaris, there is no -q option.
1.360 + if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
1.361 + LANG=C $DIFF -r $OTHER_UNZIPDIR $THIS_UNZIPDIR \
1.362 + | $GREP -v -e "^<" -e "^>" -e "^Common subdirectories:" \
1.363 + > $CONTENTS_DIFF_FILE
1.364 + else
1.365 + LANG=C $DIFF -rq $OTHER_UNZIPDIR $THIS_UNZIPDIR > $CONTENTS_DIFF_FILE
1.366 + fi
1.367 +
1.368 + ONLY_OTHER=$($GREP "^Only in $OTHER_UNZIPDIR" $CONTENTS_DIFF_FILE)
1.369 + ONLY_THIS=$($GREP "^Only in $THIS_UNZIPDIR" $CONTENTS_DIFF_FILE)
1.370 +
1.371 + return_value=0
1.372 +
1.373 + if [ -n "$ONLY_OTHER" ]; then
1.374 + echo " Only OTHER $ZIP_FILE contains:"
1.375 + echo "$ONLY_OTHER" | sed "s|Only in $OTHER_UNZIPDIR| |"g | sed 's|: |/|g'
1.376 + return_value=1
1.377 + fi
1.378 +
1.379 + if [ -n "$ONLY_THIS" ]; then
1.380 + echo " Only THIS $ZIP_FILE contains:"
1.381 + echo "$ONLY_THIS" | sed "s|Only in $THIS_UNZIPDIR| |"g | sed 's|: |/|g'
1.382 + return_value=1
1.383 + fi
1.384 +
1.385 + if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
1.386 + DIFFING_FILES=$($GREP -e "differ$" -e "^diff " $CONTENTS_DIFF_FILE \
1.387 + | $CUT -f 3 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g")
1.388 + else
1.389 + DIFFING_FILES=$($GREP -e "differ$" $CONTENTS_DIFF_FILE \
1.390 + | $CUT -f 2 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g")
1.391 + fi
1.392 +
1.393 + $RM -f $WORK_DIR/$ZIP_FILE.diffs
1.394 + for file in $DIFFING_FILES; do
1.395 + if [[ "$ACCEPTED_JARZIP_CONTENTS" != *"$file"* ]]; then
1.396 + diff_text $OTHER_UNZIPDIR/$file $THIS_UNZIPDIR/$file >> $WORK_DIR/$ZIP_FILE.diffs
1.397 + fi
1.398 + done
1.399 +
1.400 + if [ -s "$WORK_DIR/$ZIP_FILE.diffs" ]; then
1.401 + return_value=1
1.402 + echo " Differing files in $ZIP_FILE"
1.403 + $CAT $WORK_DIR/$ZIP_FILE.diffs | $GREP differ | cut -f 2 -d ' ' | \
1.404 + $SED "s|$OTHER_UNZIPDIR| |g" > $WORK_DIR/$ZIP_FILE.difflist
1.405 + $CAT $WORK_DIR/$ZIP_FILE.difflist
1.406 +
1.407 + if [ -n "$SHOW_DIFFS" ]; then
1.408 + for i in $(cat $WORK_DIR/$ZIP_FILE.difflist) ; do
1.409 + if [ -f "${OTHER_UNZIPDIR}/$i.javap" ]; then
1.410 + LANG=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap
1.411 + elif [ -f "${OTHER_UNZIPDIR}/$i.cleaned" ]; then
1.412 + LANG=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i
1.413 + else
1.414 + LANG=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i
1.415 + fi
1.416 + done
1.417 + fi
1.418 + fi
1.419 +
1.420 + return $return_value
1.421 +}
1.422 +
1.423 +
1.424 +##########################################################################################
1.425 +# Compare all zip files
1.426 +
1.427 +compare_all_zip_files() {
1.428 + THIS_DIR=$1
1.429 + OTHER_DIR=$2
1.430 + WORK_DIR=$3
1.431 +
1.432 + ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.zip" | $SORT | $FILTER )
1.433 +
1.434 + if [ -n "$ZIPS" ]; then
1.435 + echo Zip files...
1.436 +
1.437 + return_value=0
1.438 + for f in $ZIPS; do
1.439 + if [ -f "$OTHER_DIR/$f" ]; then
1.440 + compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f
1.441 + if [ "$?" != "0" ]; then
1.442 + return_value=1
1.443 + REGRESSIONS=true
1.444 + fi
1.445 + fi
1.446 + done
1.447 + fi
1.448 +
1.449 + return $return_value
1.450 +}
1.451 +
1.452 +##########################################################################################
1.453 +# Compare all jar files
1.454 +
1.455 +compare_all_jar_files() {
1.456 + THIS_DIR=$1
1.457 + OTHER_DIR=$2
1.458 + WORK_DIR=$3
1.459 +
1.460 + # TODO filter?
1.461 + ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.jar" -o -name "*.war" | $SORT | $FILTER)
1.462 +
1.463 + if [ -n "$ZIPS" ]; then
1.464 + echo Jar files...
1.465 +
1.466 + return_value=0
1.467 + for f in $ZIPS; do
1.468 + if [ -f "$OTHER_DIR/$f" ]; then
1.469 + compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f
1.470 + if [ "$?" != "0" ]; then
1.471 + return_value=1
1.472 + REGRESSIONS=true
1.473 + fi
1.474 + fi
1.475 + done
1.476 + fi
1.477 +
1.478 + return $return_value
1.479 +}
1.480 +
1.481 +##########################################################################################
1.482 +# Compare binary (executable/library) file
1.483 +
1.484 +compare_bin_file() {
1.485 + THIS_DIR=$1
1.486 + OTHER_DIR=$2
1.487 + WORK_DIR=$3
1.488 + BIN_FILE=$4
1.489 +
1.490 + THIS_FILE=$THIS_DIR/$BIN_FILE
1.491 + OTHER_FILE=$OTHER_DIR/$BIN_FILE
1.492 + NAME=$(basename $BIN_FILE)
1.493 + WORK_FILE_BASE=$WORK_DIR/$BIN_FILE
1.494 + FILE_WORK_DIR=$(dirname $WORK_FILE_BASE)
1.495 +
1.496 + $MKDIR -p $FILE_WORK_DIR
1.497 +
1.498 + ORIG_THIS_FILE="$THIS_FILE"
1.499 + ORIG_OTHER_FILE="$OTHER_FILE"
1.500 +
1.501 + if [[ "$STRIP_BEFORE_COMPARE" = *"$BIN_FILE"* ]]; then
1.502 + THIS_STRIPPED_FILE=$FILE_WORK_DIR/this/$NAME
1.503 + OTHER_STRIPPED_FILE=$FILE_WORK_DIR/other/$NAME
1.504 + $MKDIR -p $FILE_WORK_DIR/this $FILE_WORK_DIR/other
1.505 + $CP $THIS_FILE $THIS_STRIPPED_FILE
1.506 + $CP $OTHER_FILE $OTHER_STRIPPED_FILE
1.507 + $STRIP $THIS_STRIPPED_FILE
1.508 + $STRIP $OTHER_STRIPPED_FILE
1.509 + THIS_FILE="$THIS_STRIPPED_FILE"
1.510 + OTHER_FILE="$OTHER_STRIPPED_FILE"
1.511 + fi
1.512 +
1.513 + if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
1.514 + unset _NT_SYMBOL_PATH
1.515 + # On windows we need to unzip the debug symbols, if present
1.516 + OTHER_FILE_BASE=${OTHER_FILE/.dll/}
1.517 + OTHER_FILE_BASE=${OTHER_FILE_BASE/.exe/}
1.518 + DIZ_NAME=$(basename $OTHER_FILE_BASE).diz
1.519 + # java.exe and java.dll diz files will have the same name. Have to
1.520 + # make sure java.exe gets the right one. This is only needed for
1.521 + # OTHER since in the new build, all pdb files are left around.
1.522 + if [ "$NAME" = "java.exe" ] && [ -f "$OTHER/tmp/java/java/obj64/java.diz" ]; then
1.523 + OTHER_DIZ_FILE="$OTHER/tmp/java/java/obj64/java.diz"
1.524 + elif [ -f "${OTHER_FILE_BASE}.diz" ]; then
1.525 + OTHER_DIZ_FILE=${OTHER_FILE_BASE}.diz
1.526 + else
1.527 + # Some files, jli.dll, appears twice in the image but only one of
1.528 + # thme has a diz file next to it.
1.529 + OTHER_DIZ_FILE="$($FIND $OTHER_DIR -name $DIZ_NAME | $SED 1q)"
1.530 + if [ ! -f "$OTHER_DIZ_FILE" ]; then
1.531 + # As a last resort, look for diz file in the whole build output
1.532 + # dir.
1.533 + OTHER_DIZ_FILE="$($FIND $OTHER -name $DIZ_NAME | $SED 1q)"
1.534 + fi
1.535 + fi
1.536 + if [ -n "$OTHER_DIZ_FILE" ]; then
1.537 + $MKDIR -p $FILE_WORK_DIR/other
1.538 + (cd $FILE_WORK_DIR/other ; $UNARCHIVE -o $OTHER_DIZ_FILE)
1.539 + export _NT_SYMBOL_PATH="$FILE_WORK_DIR/other"
1.540 + fi
1.541 + THIS_FILE_BASE=${THIS_FILE/.dll/}
1.542 + THIS_FILE_BASE=${THIS_FILE_BASE/.exe/}
1.543 + if [ -f "${THIS_FILE/.dll/}.diz" ]; then
1.544 + THIS_DIZ_FILE=${THIS_FILE/.dll/}.diz
1.545 + else
1.546 + THIS_DIZ_FILE="$($FIND $THIS_DIR -name $DIZ_NAME | $SED 1q)"
1.547 + if [ ! -f "$THIS_DIZ_FILE" ]; then
1.548 + # As a last resort, look for diz file in the whole build output
1.549 + # dir.
1.550 + THIS_DIZ_FILE="$($FIND $THIS -name $DIZ_NAME | $SED 1q)"
1.551 + fi
1.552 + fi
1.553 + if [ -n "$THIS_DIZ_FILE" ]; then
1.554 + $MKDIR -p $FILE_WORK_DIR/this
1.555 + (cd $FILE_WORK_DIR/this ; $UNARCHIVE -o $THIS_DIZ_FILE)
1.556 + export _NT_SYMBOL_PATH="$_NT_SYMBOL_PATH;$FILE_WORK_DIR/this"
1.557 + fi
1.558 + fi
1.559 +
1.560 + if [ -z "$SKIP_BIN_DIFF" ]; then
1.561 + if cmp $OTHER_FILE $THIS_FILE > /dev/null; then
1.562 + # The files were bytewise identical.
1.563 + if [ -n "$VERBOSE" ]; then
1.564 + echo " : : : : : $BIN_FILE"
1.565 + fi
1.566 + return 0
1.567 + fi
1.568 + BIN_MSG=" diff "
1.569 + if [[ "$ACCEPTED_BIN_DIFF" != *"$BIN_FILE"* ]]; then
1.570 + DIFF_BIN=true
1.571 + if [[ "$KNOWN_BIN_DIFF" != *"$BIN_FILE"* ]]; then
1.572 + BIN_MSG="*$BIN_MSG*"
1.573 + REGRESSIONS=true
1.574 + else
1.575 + BIN_MSG=" $BIN_MSG "
1.576 + fi
1.577 + else
1.578 + BIN_MSG="($BIN_MSG)"
1.579 + DIFF_BIN=
1.580 + fi
1.581 + fi
1.582 +
1.583 + if [ -n "$STAT" ]; then
1.584 + THIS_SIZE=$($STAT $STAT_PRINT_SIZE "$THIS_FILE")
1.585 + OTHER_SIZE=$($STAT $STAT_PRINT_SIZE "$OTHER_FILE")
1.586 + else
1.587 + THIS_SIZE=$(ls -l "$THIS_FILE" | awk '{ print $5 }')
1.588 + OTHER_SIZE=$(ls -l "$OTHER_FILE" | awk '{ print $5 }')
1.589 + fi
1.590 + if [ $THIS_SIZE -ne $OTHER_SIZE ]; then
1.591 + DIFF_SIZE_NUM=$($EXPR $THIS_SIZE - $OTHER_SIZE)
1.592 + DIFF_SIZE_REL=$($EXPR $THIS_SIZE \* 100 / $OTHER_SIZE)
1.593 + SIZE_MSG=$($PRINTF "%3d%% %4d" $DIFF_SIZE_REL $DIFF_SIZE_NUM)
1.594 + if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_REL" -gt 98 ] && [ "$DIFF_SIZE_REL" -lt 102 ]; then
1.595 + SIZE_MSG="($SIZE_MSG)"
1.596 + DIFF_SIZE=
1.597 + elif [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_NUM" = 512 ]; then
1.598 + # On windows, size of binaries increase in 512 increments.
1.599 + SIZE_MSG="($SIZE_MSG)"
1.600 + DIFF_SIZE=
1.601 + else
1.602 + if [[ "$ACCEPTED_SIZE_DIFF" != *"$BIN_FILE"* ]]; then
1.603 + DIFF_SIZE=true
1.604 + if [[ "$KNOWN_SIZE_DIFF" != *"$BIN_FILE"* ]]; then
1.605 + SIZE_MSG="*$SIZE_MSG*"
1.606 + REGRESSIONS=true
1.607 + else
1.608 + SIZE_MSG=" $SIZE_MSG "
1.609 + fi
1.610 + else
1.611 + SIZE_MSG="($SIZE_MSG)"
1.612 + DIFF_SIZE=
1.613 + fi
1.614 + fi
1.615 + else
1.616 + SIZE_MSG=" "
1.617 + DIFF_SIZE=
1.618 + if [[ "$KNOWN_SIZE_DIFF $ACCEPTED_SIZE_DIFF" = *"$BIN_FILE"* ]]; then
1.619 + SIZE_MSG=" ! "
1.620 + fi
1.621 + fi
1.622 +
1.623 + if [[ "$SORT_SYMBOLS" = *"$BIN_FILE"* ]]; then
1.624 + SYM_SORT_CMD="sort"
1.625 + else
1.626 + SYM_SORT_CMD="cat"
1.627 + fi
1.628 +
1.629 + # Check symbols
1.630 + if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
1.631 + # The output from dumpbin on windows differs depending on if the debug symbol
1.632 + # files are still around at the location the binary is pointing too. Need
1.633 + # to filter out that extra information.
1.634 + $DUMPBIN -exports $OTHER_FILE | $GREP -E '^ +[0-9A-F]+ +[0-9A-F]+ [0-9A-F]+' | sed 's/ = .*//g' | cut -c27- | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
1.635 + $DUMPBIN -exports $THIS_FILE | $GREP -E '^ +[0-9A-F]+ +[0-9A-F]+ [0-9A-F]+' | sed 's/ = .*//g' | cut -c27- | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
1.636 + elif [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
1.637 + # Some symbols get seemingly random 15 character prefixes. Filter them out.
1.638 + $NM -a $ORIG_OTHER_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SED 's/^\([a-zA-Z] [\.\$]\)[a-zA-Z0-9_\$]\{15,15\}\./\1./g' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
1.639 + $NM -a $ORIG_THIS_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SED 's/^\([a-zA-Z] [\.\$]\)[a-zA-Z0-9_\$]\{15,15\}\./\1./g' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
1.640 + else
1.641 + $NM -a $ORIG_OTHER_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
1.642 + $NM -a $ORIG_THIS_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
1.643 + fi
1.644 +
1.645 + LANG=C $DIFF $WORK_FILE_BASE.symbols.other $WORK_FILE_BASE.symbols.this > $WORK_FILE_BASE.symbols.diff
1.646 + if [ -s $WORK_FILE_BASE.symbols.diff ]; then
1.647 + SYM_MSG=" diff "
1.648 + if [[ "$ACCEPTED_SYM_DIFF" != *"$BIN_FILE"* ]]; then
1.649 + DIFF_SYM=true
1.650 + if [[ "$KNOWN_SYM_DIFF" != *"$BIN_FILE"* ]]; then
1.651 + SYM_MSG="*$SYM_MSG*"
1.652 + REGRESSIONS=true
1.653 + else
1.654 + SYM_MSG=" $SYM_MSG "
1.655 + fi
1.656 + else
1.657 + SYM_MSG="($SYM_MSG)"
1.658 + DIFF_SYM=
1.659 + fi
1.660 + else
1.661 + SYM_MSG=" "
1.662 + DIFF_SYM=
1.663 + if [[ "$KNOWN_SYM_DIFF $ACCEPTED_SYM_DIFF" = *"$BIN_FILE"* ]]; then
1.664 + SYM_MSG=" ! "
1.665 + fi
1.666 + fi
1.667 +
1.668 + # Check dependencies
1.669 + if [ -n "$LDD_CMD" ]; then
1.670 + (cd $FILE_WORK_DIR && $CP $OTHER_FILE . && $LDD_CMD $NAME | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.other | $UNIQ > $WORK_FILE_BASE.deps.other.uniq)
1.671 + (cd $FILE_WORK_DIR && $CP $THIS_FILE . && $LDD_CMD $NAME | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.this | $UNIQ > $WORK_FILE_BASE.deps.this.uniq)
1.672 + (cd $FILE_WORK_DIR && $RM -f $NAME)
1.673 +
1.674 + LANG=C $DIFF $WORK_FILE_BASE.deps.other $WORK_FILE_BASE.deps.this > $WORK_FILE_BASE.deps.diff
1.675 + LANG=C $DIFF $WORK_FILE_BASE.deps.other.uniq $WORK_FILE_BASE.deps.this.uniq > $WORK_FILE_BASE.deps.diff.uniq
1.676 +
1.677 + if [ -s $WORK_FILE_BASE.deps.diff ]; then
1.678 + if [ -s $WORK_FILE_BASE.deps.diff.uniq ]; then
1.679 + DEP_MSG=" diff "
1.680 + else
1.681 + DEP_MSG=" redun "
1.682 + fi
1.683 + if [[ "$ACCEPTED_DEP_DIFF" != *"$BIN_FILE"* ]]; then
1.684 + DIFF_DEP=true
1.685 + if [[ "$KNOWN_DEP_DIFF" != *"$BIN_FILE"* ]]; then
1.686 + DEP_MSG="*$DEP_MSG*"
1.687 + REGRESSIONS=true
1.688 + else
1.689 + DEP_MSG=" $DEP_MSG "
1.690 + fi
1.691 + else
1.692 + DEP_MSG="($DEP_MSG)"
1.693 + DIFF_DEP=
1.694 + fi
1.695 + else
1.696 + DEP_MSG=" "
1.697 + DIFF_DEP=
1.698 + if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
1.699 + DEP_MSG=" ! "
1.700 + fi
1.701 + fi
1.702 + else
1.703 + DEP_MSG=" - "
1.704 + fi
1.705 +
1.706 + # Compare fulldump output
1.707 + if [ -n "$FULLDUMP_CMD" ] && [ -z "$SKIP_FULLDUMP_DIFF" ]; then
1.708 + $FULLDUMP_CMD $OTHER_FILE > $WORK_FILE_BASE.fulldump.other 2>&1
1.709 + $FULLDUMP_CMD $THIS_FILE > $WORK_FILE_BASE.fulldump.this 2>&1
1.710 + LANG=C $DIFF $WORK_FILE_BASE.fulldump.other $WORK_FILE_BASE.fulldump.this > $WORK_FILE_BASE.fulldump.diff
1.711 +
1.712 + if [ -s $WORK_FILE_BASE.fulldump.diff ]; then
1.713 + ELF_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.fulldump.diff | awk '{print $5}')
1.714 + ELF_MSG=$($PRINTF "%8d" $ELF_DIFF_SIZE)
1.715 + if [[ "$ACCEPTED_ELF_DIFF" != *"$BIN_FILE"* ]]; then
1.716 + DIFF_ELF=true
1.717 + if [[ "$KNOWN_ELF_DIFF" != *"$BIN_FILE"* ]]; then
1.718 + ELF_MSG="*$ELF_MSG*"
1.719 + REGRESSIONS=true
1.720 + else
1.721 + ELF_MSG=" $ELF_MSG "
1.722 + fi
1.723 + else
1.724 + ELF_MSG="($ELF_MSG)"
1.725 + DIFF_ELF=
1.726 + fi
1.727 + else
1.728 + ELF_MSG=" "
1.729 + DIFF_ELF=
1.730 + if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
1.731 + ELF_MSG=" ! "
1.732 + fi
1.733 + fi
1.734 + fi
1.735 +
1.736 + # Compare disassemble output
1.737 + if [ -n "$DIS_CMD" ] && [ -z "$SKIP_DIS_DIFF" ]; then
1.738 + if [ -z "$DIS_DIFF_FILTER" ]; then
1.739 + DIS_DIFF_FILTER="$CAT"
1.740 + fi
1.741 + $DIS_CMD $OTHER_FILE | $GREP -v $NAME | $DIS_DIFF_FILTER > $WORK_FILE_BASE.dis.other 2>&1
1.742 + $DIS_CMD $THIS_FILE | $GREP -v $NAME | $DIS_DIFF_FILTER > $WORK_FILE_BASE.dis.this 2>&1
1.743 +
1.744 + LANG=C $DIFF $WORK_FILE_BASE.dis.other $WORK_FILE_BASE.dis.this > $WORK_FILE_BASE.dis.diff
1.745 +
1.746 + if [ -s $WORK_FILE_BASE.dis.diff ]; then
1.747 + DIS_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.dis.diff | awk '{print $5}')
1.748 + DIS_MSG=$($PRINTF "%8d" $DIS_DIFF_SIZE)
1.749 + if [[ "$ACCEPTED_DIS_DIFF" != *"$BIN_FILE"* ]]; then
1.750 + DIFF_DIS=true
1.751 + if [[ "$KNOWN_DIS_DIFF" != *"$BIN_FILE"* ]]; then
1.752 + DIS_MSG="*$DIS_MSG*"
1.753 + REGRESSIONS=true
1.754 + else
1.755 + DIS_MSG=" $DIS_MSG "
1.756 + fi
1.757 + else
1.758 + DIS_MSG="($DIS_MSG)"
1.759 + DIFF_DIS=
1.760 + fi
1.761 + else
1.762 + DIS_MSG=" "
1.763 + DIFF_DIS=
1.764 + if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
1.765 + DIS_MSG=" ! "
1.766 + fi
1.767 + fi
1.768 + fi
1.769 +
1.770 +
1.771 + if [ -n "$DIFF_BIN$DIFF_SIZE$DIFF_SYM$DIFF_DEP$DIFF_ELF$DIFF_DIS" ] || [ -n "$VERBOSE" ]; then
1.772 + if [ -n "$BIN_MSG" ]; then echo -n "$BIN_MSG:"; fi
1.773 + if [ -n "$SIZE_MSG" ]; then echo -n "$SIZE_MSG:"; fi
1.774 + if [ -n "$SYM_MSG" ]; then echo -n "$SYM_MSG:"; fi
1.775 + if [ -n "$DEP_MSG" ]; then echo -n "$DEP_MSG:"; fi
1.776 + if [ -n "$ELF_MSG" ]; then echo -n "$ELF_MSG:"; fi
1.777 + if [ -n "$DIS_MSG" ]; then echo -n "$DIS_MSG:"; fi
1.778 + echo " $BIN_FILE"
1.779 + if [ "$SHOW_DIFFS" = "true" ]; then
1.780 + if [ -s "$WORK_FILE_BASE.symbols.diff" ]; then
1.781 + echo "Symbols diff:"
1.782 + $CAT $WORK_FILE_BASE.symbols.diff
1.783 + fi
1.784 + if [ -s "$WORK_FILE_BASE.deps.diff" ]; then
1.785 + echo "Deps diff:"
1.786 + $CAT $WORK_FILE_BASE.deps.diff
1.787 + fi
1.788 + if [ -s "$WORK_FILE_BASE.fulldump.diff" ]; then
1.789 + echo "Fulldump diff:"
1.790 + $CAT $WORK_FILE_BASE.fulldump.diff
1.791 + fi
1.792 + if [ -s "$WORK_FILE_BASE.dis.diff" ]; then
1.793 + echo "Disassembly diff:"
1.794 + $CAT $WORK_FILE_BASE.dis.diff
1.795 + fi
1.796 + fi
1.797 + return 1
1.798 + fi
1.799 + return 0
1.800 +}
1.801 +
1.802 +##########################################################################################
1.803 +# Print binary diff header
1.804 +
1.805 +print_binary_diff_header() {
1.806 + if [ -z "$SKIP_BIN_DIFF" ]; then echo -n " Binary :"; fi
1.807 + if [ -z "$SKIP_SIZE_DIFF" ]; then echo -n " Size :"; fi
1.808 + if [ -z "$SKIP_SYM_DIFF" ]; then echo -n " Symbols :"; fi
1.809 + if [ -z "$SKIP_DEP_DIFF" ]; then echo -n " Deps :"; fi
1.810 + if [ -z "$SKIP_FULLDUMP_DIFF" ]; then echo -n " Fulldump :"; fi
1.811 + if [ -z "$SKIP_DIS_DIFF" ]; then echo -n " Disass :"; fi
1.812 + echo
1.813 +}
1.814 +
1.815 +##########################################################################################
1.816 +# Compare all libraries
1.817 +
1.818 +compare_all_libs() {
1.819 + THIS_DIR=$1
1.820 + OTHER_DIR=$2
1.821 + WORK_DIR=$3
1.822 +
1.823 + LIBS=$(cd $THIS_DIR && $FIND . -type f \( -name 'lib*.so' -o -name '*.dylib' -o -name '*.dll' \) | $SORT | $FILTER)
1.824 +
1.825 + if [ -n "$LIBS" ]; then
1.826 + echo Libraries...
1.827 + print_binary_diff_header
1.828 + for l in $LIBS; do
1.829 + if [ -f "$OTHER_DIR/$l" ]; then
1.830 + compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $l
1.831 + if [ "$?" != "0" ]; then
1.832 + return_value=1
1.833 + fi
1.834 + fi
1.835 + done
1.836 + fi
1.837 +
1.838 + return $return_value
1.839 +}
1.840 +
1.841 +##########################################################################################
1.842 +# Compare all executables
1.843 +
1.844 +compare_all_execs() {
1.845 + THIS_DIR=$1
1.846 + OTHER_DIR=$2
1.847 + WORK_DIR=$3
1.848 +
1.849 + if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
1.850 + EXECS=$(cd $THIS_DIR && $FIND . -type f -name '*.exe' | $SORT | $FILTER)
1.851 + else
1.852 + EXECS=$(cd $THIS_DIR && $FIND . -name db -prune -o -type f -perm -100 \! \( -name '*.so' -o -name '*.dylib' -o -name '*.dll' -o -name '*.cgi' -o -name '*.jar' -o -name '*.diz' \) | $SORT | $FILTER)
1.853 + fi
1.854 +
1.855 + if [ -n "$EXECS" ]; then
1.856 + echo Executables...
1.857 + print_binary_diff_header
1.858 + for e in $EXECS; do
1.859 + if [ -f "$OTHER_DIR/$e" ]; then
1.860 + compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $e
1.861 + if [ "$?" != "0" ]; then
1.862 + return_value=1
1.863 + fi
1.864 + fi
1.865 + done
1.866 + fi
1.867 +
1.868 + return $return_value
1.869 +}
1.870 +
1.871 +##########################################################################################
1.872 +# Initiate configuration
1.873 +
1.874 +COMPARE_ROOT=/tmp/cimages.$USER
1.875 +$MKDIR -p $COMPARE_ROOT
1.876 +if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
1.877 + if [ "$(uname -o)" = "Cygwin" ]; then
1.878 + COMPARE_ROOT=$(cygpath -msa $COMPARE_ROOT)
1.879 + fi
1.880 +fi
1.881 +
1.882 +THIS="$( cd "$( dirname "$0" )" && pwd )"
1.883 +echo "$THIS"
1.884 +THIS_SCRIPT="$0"
1.885 +
1.886 +if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1" = "/?" ] || [ "$1" = "-help" ] || [ "$1" = "--help" ]; then
1.887 + echo "bash ./compare.sh [OPTIONS] [FILTER]"
1.888 + echo ""
1.889 + echo "-all Compare all files in all known ways"
1.890 + echo "-names Compare the file names and directory structure"
1.891 + echo "-perms Compare the permission bits on all files and directories"
1.892 + echo "-types Compare the output of the file command on all files"
1.893 + echo "-general Compare the files not convered by the specialized comparisons"
1.894 + echo "-zips Compare the contents of all zip files"
1.895 + echo "-jars Compare the contents of all jar files"
1.896 + echo "-libs Compare all native libraries"
1.897 + echo "-execs Compare all executables"
1.898 + echo "-v Verbose output, does not hide known differences"
1.899 + echo "-vv More verbose output, shows diff output of all comparisons"
1.900 + echo "-o [OTHER] Compare with build in other directory. Will default to the old build directory"
1.901 + echo ""
1.902 + echo "[FILTER] List filenames in the image to compare, works for jars, zips, libs and execs"
1.903 + echo "Example:"
1.904 + echo "bash ./common/bin/compareimages.sh CodePointIM.jar"
1.905 + exit 10
1.906 +fi
1.907 +
1.908 +CMP_NAMES=false
1.909 +CMP_PERMS=false
1.910 +CMP_TYPES=false
1.911 +CMP_GENERAL=false
1.912 +CMP_ZIPS=false
1.913 +CMP_JARS=false
1.914 +CMP_LIBS=false
1.915 +CMP_EXECS=false
1.916 +
1.917 +while [ -n "$1" ]; do
1.918 + case "$1" in
1.919 + -v)
1.920 + VERBOSE=true
1.921 + ;;
1.922 + -vv)
1.923 + VERBOSE=true
1.924 + SHOW_DIFFS=true
1.925 + ;;
1.926 + -o)
1.927 + OTHER="$2"
1.928 + shift
1.929 + ;;
1.930 + -all)
1.931 + CMP_NAMES=true
1.932 + if [ "$OPENJDK_TARGET_OS" != "windows" ]; then
1.933 + CMP_PERMS=true
1.934 + fi
1.935 + CMP_TYPES=true
1.936 + CMP_GENERAL=true
1.937 + CMP_ZIPS=true
1.938 + CMP_JARS=true
1.939 + CMP_LIBS=true
1.940 + CMP_EXECS=true
1.941 + ;;
1.942 + -names)
1.943 + CMP_NAMES=true
1.944 + ;;
1.945 + -perms)
1.946 + CMP_PERMS=true
1.947 + ;;
1.948 + -types)
1.949 + CMP_TYPES=true
1.950 + ;;
1.951 + -general)
1.952 + CMP_GENERAL=true
1.953 + ;;
1.954 + -zips)
1.955 + CMP_ZIPS=true
1.956 + ;;
1.957 + -jars)
1.958 + CMP_JARS=true
1.959 + ;;
1.960 + -libs)
1.961 + CMP_LIBS=true
1.962 + ;;
1.963 + -execs)
1.964 + CMP_EXECS=true
1.965 + ;;
1.966 + *)
1.967 + CMP_NAMES=false
1.968 + CMP_PERMS=false
1.969 + CMP_TYPES=false
1.970 + CMP_ZIPS=true
1.971 + CMP_JARS=true
1.972 + CMP_LIBS=true
1.973 + CMP_EXECS=true
1.974 +
1.975 + if [ -z "$FILTER" ]; then
1.976 + FILTER="$GREP"
1.977 + fi
1.978 + FILTER="$FILTER -e $1"
1.979 + ;;
1.980 + esac
1.981 + shift
1.982 +done
1.983 +
1.984 +if [ "$CMP_NAMES" = "false" ] && [ "$CMP_TYPES" = "false" ] && [ "$CMP_PERMS" = "false" ] && [ "$CMP_GENERAL" = "false" ] && [ "$CMP_ZIPS" = "false" ] && [ "$CMP_JARS" = "false" ] && [ "$CMP_LIBS" = "false" ] && [ "$CMP_EXECS" = "false" ]; then
1.985 + CMP_NAMES=true
1.986 + CMP_PERMS=true
1.987 + CMP_TYPES=true
1.988 + CMP_GENERAL=true
1.989 + CMP_ZIPS=true
1.990 + CMP_JARS=true
1.991 + CMP_LIBS=true
1.992 + CMP_EXECS=true
1.993 +fi
1.994 +
1.995 +if [ -z "$FILTER" ]; then
1.996 + FILTER="$CAT"
1.997 +fi
1.998 +
1.999 +if [ -z "$OTHER" ]; then
1.1000 + OTHER="$THIS/../$LEGACY_BUILD_DIR"
1.1001 + if [ -d "$OTHER" ]; then
1.1002 + OTHER="$( cd "$OTHER" && pwd )"
1.1003 + else
1.1004 + echo "Default old build directory does not exist:"
1.1005 + echo "$OTHER"
1.1006 + exit 1
1.1007 + fi
1.1008 + echo "Comparing to default old build:"
1.1009 + echo "$OTHER"
1.1010 + echo
1.1011 +else
1.1012 + if [ ! -d "$OTHER" ]; then
1.1013 + echo "Other build directory does not exist:"
1.1014 + echo "$OTHER"
1.1015 + exit 1
1.1016 + fi
1.1017 + OTHER="$( cd "$OTHER" && pwd )"
1.1018 + echo "Comparing to:"
1.1019 + echo "$OTHER"
1.1020 + echo
1.1021 +fi
1.1022 +
1.1023 +
1.1024 +# Figure out the layout of the this build. Which kinds of images have been produced
1.1025 +if [ -d "$THIS/deploy/j2sdk-image" ]; then
1.1026 + THIS_J2SDK="$THIS/deploy/j2sdk-image"
1.1027 + THIS_J2RE="$THIS/deploy/j2re-image"
1.1028 +elif [ -d "$THIS/images/j2sdk-image" ]; then
1.1029 + THIS_J2SDK="$THIS/images/j2sdk-image"
1.1030 + THIS_J2RE="$THIS/images/j2re-image"
1.1031 +fi
1.1032 +if [ -d "$THIS/images/j2sdk-overlay-image" ]; then
1.1033 + THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
1.1034 + THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
1.1035 +fi
1.1036 +
1.1037 +if [ -d "$THIS/images/j2sdk-bundle" ]; then
1.1038 + THIS_J2SDK_BUNDLE="$THIS/images/j2sdk-bundle"
1.1039 + THIS_J2RE_BUNDLE="$THIS/images/j2re-bundle"
1.1040 +fi
1.1041 +
1.1042 +# Figure out the layout of the other build (old or new, normal or overlay image)
1.1043 +if [ -d "$OTHER/j2sdk-image" ]; then
1.1044 + if [ -f "$OTHER/j2sdk-image/LICENSE" ]; then
1.1045 + OTHER_J2SDK="$OTHER/j2sdk-image"
1.1046 + OTHER_J2RE="$OTHER/j2re-image"
1.1047 + else
1.1048 + OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image"
1.1049 + OTHER_J2RE_OVERLAY="$OTHER/j2re-image"
1.1050 + fi
1.1051 +
1.1052 +fi
1.1053 +
1.1054 +if [ -d "$OTHER/j2sdk-bundle" ]; then
1.1055 + OTHER_J2SDK_BUNDLE="$OTHER/j2sdk-bundle"
1.1056 + OTHER_J2RE_BUNDLE="$OTHER/j2re-bundle"
1.1057 +elif [ -d "$OTHER/images/j2sdk-bundle" ]; then
1.1058 + OTHER_J2SDK_BUNDLE="$OTHER/images/j2sdk-bundle"
1.1059 + OTHER_J2RE_BUNDLE="$OTHER/images/j2re-bundle"
1.1060 +fi
1.1061 +
1.1062 +if [ -z "$THIS_J2SDK" ] || [ -z "$THIS_J2RE" ]; then
1.1063 + if [ -z "$THIS_J2SDK_OVERLAY" ]; then
1.1064 + echo "Cannot locate images for this build. Are you sure you have run 'make images'?"
1.1065 + exit 1
1.1066 + fi
1.1067 +fi
1.1068 +
1.1069 +if [ -z "$OTHER_J2SDK" ] && [ -n "$OTHER_J2SDK_OVERLAY" ] && [ -z "$THIS_J2SDK_OVERLAY" ]; then
1.1070 + echo "OTHER build only has an overlay image while this build does not. Nothing to compare!"
1.1071 + exit 1
1.1072 +fi
1.1073 +
1.1074 +if [ -z "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
1.1075 + echo "WARNING! OTHER build has bundles built while this build does not."
1.1076 + echo "Skipping bundle compare!"
1.1077 +fi
1.1078 +
1.1079 +##########################################################################################
1.1080 +# Do the work
1.1081 +
1.1082 +if [ "$CMP_NAMES" = "true" ]; then
1.1083 + if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1.1084 + echo -n "J2SDK "
1.1085 + compare_dirs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1.1086 + echo -n "J2RE "
1.1087 + compare_dirs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
1.1088 +
1.1089 + echo -n "J2SDK "
1.1090 + compare_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1.1091 + echo -n "J2RE "
1.1092 + compare_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
1.1093 + fi
1.1094 + if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
1.1095 + echo -n "J2SDK Overlay "
1.1096 + compare_dirs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
1.1097 + echo -n "J2RE Overlay "
1.1098 + compare_dirs $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
1.1099 +
1.1100 + echo -n "J2SDK Overlay "
1.1101 + compare_files $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
1.1102 + echo -n "J2RE Overlay "
1.1103 + compare_files $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
1.1104 + fi
1.1105 + if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
1.1106 + echo -n "J2SDK Bundle "
1.1107 + compare_dirs $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle
1.1108 + echo -n "J2RE Bundle "
1.1109 + compare_dirs $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
1.1110 +
1.1111 + echo -n "J2SDK Bundle "
1.1112 + compare_files $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle
1.1113 + echo -n "J2RE Bundle "
1.1114 + compare_files $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
1.1115 + fi
1.1116 +fi
1.1117 +
1.1118 +if [ "$CMP_PERMS" = "true" ]; then
1.1119 + if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1.1120 + echo -n "J2SDK "
1.1121 + compare_permissions $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1.1122 + echo -n "J2RE "
1.1123 + compare_permissions $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
1.1124 + fi
1.1125 + if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
1.1126 + echo -n "J2SDK Overlay "
1.1127 + compare_permissions $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
1.1128 + echo -n "J2RE Overlay "
1.1129 + compare_permissions $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
1.1130 + fi
1.1131 + if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
1.1132 + echo -n "J2SDK Bundle "
1.1133 + compare_permissions $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle
1.1134 + echo -n "J2RE Bundle "
1.1135 + compare_permissions $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
1.1136 + fi
1.1137 +fi
1.1138 +
1.1139 +if [ "$CMP_TYPES" = "true" ]; then
1.1140 + if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1.1141 + echo -n "J2SDK "
1.1142 + compare_file_types $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1.1143 + echo -n "J2RE "
1.1144 + compare_file_types $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
1.1145 + fi
1.1146 + if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
1.1147 + echo -n "J2SDK Overlay "
1.1148 + compare_file_types $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
1.1149 + echo -n "J2RE Overlay "
1.1150 + compare_file_types $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
1.1151 + fi
1.1152 + if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
1.1153 + echo -n "J2SDK Bundle "
1.1154 + compare_file_types $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle
1.1155 + echo -n "J2RE Bundle "
1.1156 + compare_file_types $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
1.1157 + fi
1.1158 +fi
1.1159 +
1.1160 +if [ "$CMP_GENERAL" = "true" ]; then
1.1161 + if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1.1162 + echo -n "J2SDK "
1.1163 + compare_general_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1.1164 + echo -n "J2RE "
1.1165 + compare_general_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
1.1166 + fi
1.1167 + if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
1.1168 + echo -n "J2SDK Overlay "
1.1169 + compare_general_files $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
1.1170 + echo -n "J2RE Overlay "
1.1171 + compare_general_files $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
1.1172 + fi
1.1173 + if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
1.1174 + echo -n "J2SDK Bundle "
1.1175 + compare_general_files $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle
1.1176 + echo -n "J2RE Bundle "
1.1177 + compare_general_files $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
1.1178 + fi
1.1179 +fi
1.1180 +
1.1181 +if [ "$CMP_ZIPS" = "true" ]; then
1.1182 + if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1.1183 + compare_all_zip_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1.1184 + fi
1.1185 +fi
1.1186 +
1.1187 +if [ "$CMP_JARS" = "true" ]; then
1.1188 + if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1.1189 + compare_all_jar_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1.1190 + fi
1.1191 +fi
1.1192 +
1.1193 +if [ "$CMP_LIBS" = "true" ]; then
1.1194 + if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1.1195 + compare_all_libs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1.1196 + fi
1.1197 + if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
1.1198 + echo -n "Bundle "
1.1199 + compare_all_libs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
1.1200 + fi
1.1201 +fi
1.1202 +
1.1203 +if [ "$CMP_EXECS" = "true" ]; then
1.1204 + if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1.1205 + compare_all_execs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1.1206 + fi
1.1207 + if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
1.1208 + echo -n "Overlay "
1.1209 + compare_all_execs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
1.1210 + fi
1.1211 +fi
1.1212 +
1.1213 +echo
1.1214 +
1.1215 +if [ -n "$REGRESSIONS" ]; then
1.1216 + echo "REGRESSIONS FOUND!"
1.1217 + echo
1.1218 + exit 1
1.1219 +else
1.1220 + echo "No regressions found"
1.1221 + echo
1.1222 + exit 0
1.1223 +fi
