compare.sh revision 1243:56e20ce67f01
1#!/bin/bash 2# 3# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. 4# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5# 6# This code is free software; you can redistribute it and/or modify it 7# under the terms of the GNU General Public License version 2 only, as 8# published by the Free Software Foundation. 9# 10# This code is distributed in the hope that it will be useful, but WITHOUT 11# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 12# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 13# version 2 for more details (a copy is included in the LICENSE file that 14# accompanied this code). 15# 16# You should have received a copy of the GNU General Public License version 17# 2 along with this work; if not, write to the Free Software Foundation, 18# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 19# 20# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 21# or visit www.oracle.com if you need additional information or have any 22# questions. 23# 24 25# This script is processed by configure before it's usable. It is run from 26# the root of the build directory. 27 28 29########################################################################################## 30 31# Check that we are run via the wrapper generated by configure 32if [ -z "$SRC_ROOT" ]; then 33 echo "Error: You must run this script using build/[conf]/compare.sh" 34 exit 1 35fi 36 37if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then 38 FULLDUMP_CMD="$OTOOL -v -V -h -X -t -d" 39 LDD_CMD="$OTOOL -L" 40 DIS_CMD="$OTOOL -v -t" 41 STAT_PRINT_SIZE="-f %z" 42elif [ "$OPENJDK_TARGET_OS" = "windows" ]; then 43 FULLDUMP_CMD="$DUMPBIN -all" 44 LDD_CMD="$DUMPBIN -dependants | $GREP .dll" 45 DIS_CMD="$DUMPBIN -disasm:nobytes" 46 STAT_PRINT_SIZE="-c %s" 47else 48 FULLDUMP_CMD="$READELF -a" 49 LDD_CMD="$LDD" 50 DIS_CMD="$OBJDUMP -d" 51 STAT_PRINT_SIZE="-c %s" 52fi 53 54UNARCHIVE="$UNZIP -q" 55 56COMPARE_EXCEPTIONS_INCLUDE="$SRC_ROOT/common/bin/compare_exceptions.sh.incl" 57if [ ! -e "$COMPARE_EXCEPTIONS_INCLUDE" ]; then 58 echo "Error: Cannot locate the exceptions file, it should have been here: $COMPARE_EXCEPTIONS_INCLUDE" 59 exit 1 60fi 61# Include exception definitions 62. "$COMPARE_EXCEPTIONS_INCLUDE" 63 64########################################################################################## 65# Compare text files and ignore specific differences: 66# 67# * Timestamps in Java sources generated by idl2java 68# * Sorting order and cleanup style in .properties files 69 70diff_text() { 71 OTHER_FILE=$1 72 THIS_FILE=$2 73 74 SUFFIX="${THIS_FILE##*.}" 75 76 TMP=1 77 78 if [[ "$THIS_FILE" = *"META-INF/MANIFEST.MF" ]]; then 79 TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \ 80 $GREP '^[<>]' | \ 81 $SED -e '/[<>] Ant-Version: Apache Ant .*/d' \ 82 -e '/[<>] Created-By: .* (Oracle Corporation).*/d') 83 fi 84 if test "x$SUFFIX" = "xjava"; then 85 TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \ 86 $GREP '^[<>]' | \ 87 $SED -e '/[<>] \* from.*\.idl/d' \ 88 -e '/[<>] \*.*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \ 89 -e '/[<>] \*.*[0-9]\{4\} [0-9][0-9]*:[0-9]\{2\}:[0-9]\{2\}.*/d' \ 90 -e '/\/\/ Generated from input file.*/d' \ 91 -e '/\/\/ This file was generated AUTOMATICALLY from a template file.*/d' \ 92 -e '/\/\/ java GenerateCharacter.*/d') 93 fi 94 # Ignore date strings in class files. 95 # On Macosx the system sources for generated java classes produce different output on 96 # consequtive invocations seemingly randomly. 97 # For example a method parameter randomly named "thePoint" or "aPoint". Ignore this. 98 # Anonymous lambda classes get randomly assigned counters in their names. 99 if test "x$SUFFIX" = "xclass"; then 100 # To improve performance when large diffs are found, do a rough filtering of classes 101 # elibeble for these exceptions 102 if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' \ 103 -e '[0-9]\{2\}/[0-9]\{2\}/[0-9]\{4\}' \ 104 -e thePoint -e aPoint -e setItemsPtr \ 105 -e 'lambda\$[a-zA-Z0-9]*\$[0-9]' ${THIS_FILE} > /dev/null; then 106 $JAVAP -c -constants -l -p "${OTHER_FILE}" > ${OTHER_FILE}.javap 107 $JAVAP -c -constants -l -p "${THIS_FILE}" > ${THIS_FILE}.javap 108 TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \ 109 $GREP '^[<>]' | \ 110 $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \ 111 -e '/[0-9]\{2\}\/[0-9]\{2\}\/[0-9]\{4\}/d' \ 112 -e '/[<>].*Point Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \ 113 -e '/[<>].*public com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*itemsPtr();/d' \ 114 -e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d' \ 115 -e '/[<>].*lambda\$[a-zA-Z0-9]*\$[0-9]*/d') 116 fi 117 fi 118 if test "x$SUFFIX" = "xproperties"; then 119 # Run through nawk to add possibly missing newline at end of file. 120 $CAT $OTHER_FILE | $NAWK '{ print }' | LC_ALL=C $SORT > $OTHER_FILE.cleaned 121# Disable this exception since we aren't changing the properties cleaning method yet. 122# $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \ 123# | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \ 124# | $SED -e '/^#/d' -e '/^$/d' \ 125# -e :a -e '/\\$/N; s/\\\n//; ta' \ 126# -e 's/^[ \t]*//;s/[ \t]*$//' \ 127# -e 's/\\=/=/' | LC_ALL=C $SORT > $OTHER_FILE.cleaned 128 # Filter out date string differences. 129 TMP=$(LC_ALL=C $DIFF $OTHER_FILE.cleaned $THIS_FILE | \ 130 $GREP '^[<>]' | \ 131 $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d') 132 fi 133 if test "x$SUFFIX" = "xMF"; then 134 # Filter out date string differences. 135 TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \ 136 $GREP '^[<>]' | \ 137 $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d') 138 fi 139 if test -n "$TMP"; then 140 echo Files $OTHER_FILE and $THIS_FILE differ 141 return 1 142 fi 143 144 return 0 145} 146 147########################################################################################## 148# Compare directory structure 149 150compare_dirs() { 151 THIS_DIR=$1 152 OTHER_DIR=$2 153 WORK_DIR=$3 154 155 mkdir -p $WORK_DIR 156 157 (cd $OTHER_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_other) 158 (cd $THIS_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_this) 159 160 $DIFF $WORK_DIR/dirs_other $WORK_DIR/dirs_this > $WORK_DIR/dirs_diff 161 162 echo -n Directory structure... 163 if [ -s $WORK_DIR/dirs_diff ]; then 164 echo Differences found. 165 REGRESSIONS=true 166 # Differences in directories found. 167 ONLY_OTHER=$($GREP '<' $WORK_DIR/dirs_diff) 168 if [ "$ONLY_OTHER" ]; then 169 echo Only in $OTHER 170 $GREP '<' $WORK_DIR/dirs_diff | $SED 's|< ./| |g' 171 fi 172 ONLY_THIS=$($GREP '>' $WORK_DIR/dirs_diff) 173 if [ "$ONLY_THIS" ]; then 174 echo Only in $THIS 175 $GREP '>' $WORK_DIR/dirs_diff | $SED 's|> ./| |g' 176 fi 177 else 178 echo Identical! 179 fi 180} 181 182 183########################################################################################## 184# Compare file structure 185 186compare_files() { 187 THIS_DIR=$1 188 OTHER_DIR=$2 189 WORK_DIR=$3 190 191 $MKDIR -p $WORK_DIR 192 193 (cd $OTHER_DIR && $FIND . ! -type d | $SORT > $WORK_DIR/files_other) 194 (cd $THIS_DIR && $FIND . ! -type d | $SORT > $WORK_DIR/files_this) 195 196 $DIFF $WORK_DIR/files_other $WORK_DIR/files_this > $WORK_DIR/files_diff 197 198 echo -n File names... 199 if [ -s $WORK_DIR/files_diff ]; then 200 echo Differences found. 201 REGRESSIONS=true 202 # Differences in files found. 203 ONLY_OTHER=$($GREP '<' $WORK_DIR/files_diff) 204 if [ "$ONLY_OTHER" ]; then 205 echo Only in $OTHER 206 $GREP '<' $WORK_DIR/files_diff | $SED 's|< ./| |g' 207 fi 208 ONLY_THIS=$($GREP '>' $WORK_DIR/files_diff) 209 if [ "$ONLY_THIS" ]; then 210 echo Only in $THIS 211 $GREP '>' $WORK_DIR/files_diff | $SED 's|> ./| |g' 212 fi 213 else 214 echo Identical! 215 fi 216} 217 218 219########################################################################################## 220# Compare permissions 221 222compare_permissions() { 223 THIS_DIR=$1 224 OTHER_DIR=$2 225 WORK_DIR=$3 226 227 mkdir -p $WORK_DIR 228 229 echo -n Permissions... 230 found="" 231 for f in `cd $OTHER_DIR && $FIND . -type f` 232 do 233 if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi 234 if [ ! -f ${THIS_DIR}/$f ]; then continue; fi 235 OP=`ls -l ${OTHER_DIR}/$f | awk '{printf("%.10s\n", $1);}'` 236 TP=`ls -l ${THIS_DIR}/$f | awk '{printf("%.10s\n", $1);}'` 237 if [ "$OP" != "$TP" ] 238 then 239 if [ -z "$found" ]; then echo ; found="yes"; fi 240 $PRINTF "\told: ${OP} new: ${TP}\t$f\n" 241 fi 242 done 243 if [ -z "$found" ]; then 244 echo "Identical!" 245 else 246 REGRESSIONS=true 247 fi 248} 249 250########################################################################################## 251# Compare file command output 252 253compare_file_types() { 254 THIS_DIR=$1 255 OTHER_DIR=$2 256 WORK_DIR=$3 257 258 $MKDIR -p $WORK_DIR 259 260 echo -n File types... 261 found="" 262 for f in `cd $OTHER_DIR && $FIND . ! -type d` 263 do 264 if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi 265 if [ ! -f ${THIS_DIR}/$f ]; then continue; fi 266 OF=`cd ${OTHER_DIR} && $FILE -h $f | $SED 's/BuildID[^,]*//g'` 267 TF=`cd ${THIS_DIR} && $FILE -h $f | $SED 's/BuildID[^,]*//g'` 268 if [ "$f" = "./src.zip" ] || [[ "$f" = *"/Home/src.zip" ]] || [[ "$f" = *"/lib/JObjC.jar" ]] 269 then 270 if [ "`echo $OF | $GREP -ic zip`" -gt 0 -a "`echo $TF | $GREP -ic zip`" -gt 0 ] 271 then 272 # the way we produces zip-files make it so that directories are stored in old file 273 # but not in new (only files with full-path) 274 # this makes file-5.09 report them as different 275 continue; 276 fi 277 fi 278 279 if [ "$OF" != "$TF" ] 280 then 281 if [ -z "$found" ]; then echo ; found="yes"; fi 282 $PRINTF "\tother: ${OF}\n\tthis : ${TF}\n" 283 fi 284 done 285 if [ -z "$found" ]; then 286 echo "Identical!" 287 else 288 REGRESSIONS=true 289 fi 290} 291 292########################################################################################## 293# Compare the rest of the files 294 295compare_general_files() { 296 THIS_DIR=$1 297 OTHER_DIR=$2 298 WORK_DIR=$3 299 300 GENERAL_FILES=$(cd $THIS_DIR && $FIND . -type f ! -name "*.so" ! -name "*.jar" ! -name "*.zip" \ 301 ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" ! -name "*.jimage" \ 302 ! -name "ct.sym" ! -name "*.diz" ! -name "*.dll" \ 303 ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \ 304 ! -name "*.lib" ! -name "*.war" ! -name "JavaControlPanel" \ 305 | $GREP -v "./bin/" | $SORT | $FILTER) 306 307 echo General files... 308 for f in $GENERAL_FILES 309 do 310 if [ -e $OTHER_DIR/$f ]; then 311 SUFFIX="${f##*.}" 312 if [ "$(basename $f)" = "release" ]; then 313 # Ignore differences in change numbers in release file. 314 OTHER_FILE=$WORK_DIR/$f.other 315 THIS_FILE=$WORK_DIR/$f.this 316 $MKDIR -p $(dirname $OTHER_FILE) 317 $MKDIR -p $(dirname $THIS_FILE) 318 $CAT $OTHER_DIR/$f | $SED 's/\:[0-9a-f]\{12,12\}/:CHANGE/g' > $OTHER_FILE 319 $CAT $THIS_DIR/$f | $SED 's/\:[0-9a-f]\{12,12\}/:CHANGE/g' > $THIS_FILE 320 elif [ "x$SUFFIX" = "xhtml" ]; then 321 # Ignore time stamps in docs files 322 OTHER_FILE=$WORK_DIR/$f.other 323 THIS_FILE=$WORK_DIR/$f.this 324 $MKDIR -p $(dirname $OTHER_FILE) 325 $MKDIR -p $(dirname $THIS_FILE) 326 #Note that | doesn't work on mac sed. 327 $CAT $OTHER_DIR/$f | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \ 328 -e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \ 329 -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/(removed)/' \ 330 -e 's/[A-Z][a-z]* [A-Z][a-z]* [0-9][0-9] [0-9][0-9:]* [A-Z][A-Z]* [12][0-9]*/(removed)/' \ 331 -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \ 332 -e 's/^\(.*\)\( o'"'"'clock \)\([A-Z][A-Z][A-Z]\)/(removed)\2(removed)/' \ 333 > $OTHER_FILE 334 $CAT $THIS_DIR/$f | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \ 335 -e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \ 336 -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/(removed)/' \ 337 -e 's/[A-Z][a-z]* [A-Z][a-z]* [0-9][0-9] [0-9][0-9:]* [A-Z][A-Z]* [12][0-9]*/(removed)/' \ 338 -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \ 339 -e 's/^\(.*\)\( o'"'"'clock \)\([A-Z][A-Z][A-Z]\)/(removed)\2(removed)/' \ 340 > $THIS_FILE 341 else 342 OTHER_FILE=$OTHER_DIR/$f 343 THIS_FILE=$THIS_DIR/$f 344 fi 345 DIFF_OUT=$($DIFF $OTHER_FILE $THIS_FILE 2>&1) 346 if [ -n "$DIFF_OUT" ]; then 347 echo $f 348 REGRESSIONS=true 349 if [ "$SHOW_DIFFS" = "true" ]; then 350 echo "$DIFF_OUT" 351 fi 352 fi 353 fi 354 done 355 356 357} 358 359########################################################################################## 360# Compare zip file 361 362compare_zip_file() { 363 THIS_DIR=$1 364 OTHER_DIR=$2 365 WORK_DIR=$3 366 ZIP_FILE=$4 367 # Optionally provide different name for other zipfile 368 OTHER_ZIP_FILE=$5 369 370 THIS_ZIP=$THIS_DIR/$ZIP_FILE 371 if [ -n "$OTHER_ZIP_FILE" ]; then 372 OTHER_ZIP=$OTHER_DIR/$OTHER_ZIP_FILE 373 else 374 OTHER_ZIP=$OTHER_DIR/$ZIP_FILE 375 fi 376 377 THIS_SUFFIX="${THIS_ZIP##*.}" 378 OTHER_SUFFIX="${OTHER_ZIP##*.}" 379 if [ "$THIS_SUFFIX" != "$OTHER_SUFFIX" ]; then 380 echo The files do not have the same suffix type! 381 return 2 382 fi 383 384 TYPE="$THIS_SUFFIX" 385 386 if $CMP $OTHER_ZIP $THIS_ZIP > /dev/null 387 then 388 return 0 389 fi 390 # Not quite identical, the might still contain the same data. 391 # Unpack the jar/zip files in temp dirs 392 393 THIS_UNZIPDIR=$WORK_DIR/$ZIP_FILE.this 394 OTHER_UNZIPDIR=$WORK_DIR/$ZIP_FILE.other 395 $RM -rf $THIS_UNZIPDIR $OTHER_UNZIPDIR 396 $MKDIR -p $THIS_UNZIPDIR 397 $MKDIR -p $OTHER_UNZIPDIR 398 if [ "$TYPE" = "jimage" ] 399 then 400 (cd $THIS_UNZIPDIR && $JIMAGE extract $THIS_ZIP) 401 (cd $OTHER_UNZIPDIR && $JIMAGE extract $OTHER_ZIP) 402 else 403 (cd $THIS_UNZIPDIR && $UNARCHIVE $THIS_ZIP) 404 (cd $OTHER_UNZIPDIR && $UNARCHIVE $OTHER_ZIP) 405 fi 406 407 # Find all archives inside and unzip them as well to compare the contents rather than 408 # the archives. pie.jar.pack.gz i app3.war is corrupt, skip it. 409 EXCEPTIONS="pie.jar.pack.gz" 410 for pack in $($FIND $THIS_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do 411 ($UNPACK200 $pack $pack.jar) 412 # Filter out the unzipped archives from the diff below. 413 EXCEPTIONS="$EXCEPTIONS $pack $pack.jar" 414 done 415 for pack in $($FIND $OTHER_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do 416 ($UNPACK200 $pack $pack.jar) 417 EXCEPTIONS="$EXCEPTIONS $pack $pack.jar" 418 done 419 for zip in $($FIND $THIS_UNZIPDIR -name "*.jar" -o -name "*.zip"); do 420 $MKDIR $zip.unzip 421 (cd $zip.unzip && $UNARCHIVE $zip) 422 EXCEPTIONS="$EXCEPTIONS $zip" 423 done 424 for zip in $($FIND $OTHER_UNZIPDIR -name "*.jar" -o -name "*.zip"); do 425 $MKDIR $zip.unzip 426 (cd $zip.unzip && $UNARCHIVE $zip) 427 EXCEPTIONS="$EXCEPTIONS $zip" 428 done 429 430 CONTENTS_DIFF_FILE=$WORK_DIR/$ZIP_FILE.diff 431 # On solaris, there is no -q option. 432 if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then 433 LC_ALL=C $DIFF -r $OTHER_UNZIPDIR $THIS_UNZIPDIR \ 434 | $GREP -v -e "^<" -e "^>" -e "^Common subdirectories:" \ 435 > $CONTENTS_DIFF_FILE 436 else 437 LC_ALL=C $DIFF -rq $OTHER_UNZIPDIR $THIS_UNZIPDIR > $CONTENTS_DIFF_FILE 438 fi 439 440 ONLY_OTHER=$($GREP "^Only in $OTHER_UNZIPDIR" $CONTENTS_DIFF_FILE) 441 ONLY_THIS=$($GREP "^Only in $THIS_UNZIPDIR" $CONTENTS_DIFF_FILE) 442 443 return_value=0 444 445 if [ -n "$ONLY_OTHER" ]; then 446 echo " Only OTHER $ZIP_FILE contains:" 447 echo "$ONLY_OTHER" | sed "s|Only in $OTHER_UNZIPDIR| |"g | sed 's|: |/|g' 448 return_value=1 449 fi 450 451 if [ -n "$ONLY_THIS" ]; then 452 echo " Only THIS $ZIP_FILE contains:" 453 echo "$ONLY_THIS" | sed "s|Only in $THIS_UNZIPDIR| |"g | sed 's|: |/|g' 454 return_value=1 455 fi 456 457 if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then 458 DIFFING_FILES=$($GREP -e "differ$" -e "^diff " $CONTENTS_DIFF_FILE \ 459 | $CUT -f 3 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g") 460 else 461 DIFFING_FILES=$($GREP -e "differ$" $CONTENTS_DIFF_FILE \ 462 | $CUT -f 2 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g") 463 fi 464 465 $RM -f $WORK_DIR/$ZIP_FILE.diffs 466 for file in $DIFFING_FILES; do 467 if [[ "$ACCEPTED_JARZIP_CONTENTS $EXCEPTIONS" != *"$file"* ]]; then 468 diff_text $OTHER_UNZIPDIR/$file $THIS_UNZIPDIR/$file >> $WORK_DIR/$ZIP_FILE.diffs 469 fi 470 done 471 472 if [ -s "$WORK_DIR/$ZIP_FILE.diffs" ]; then 473 return_value=1 474 echo " Differing files in $ZIP_FILE" 475 $CAT $WORK_DIR/$ZIP_FILE.diffs | $GREP differ | cut -f 2 -d ' ' | \ 476 $SED "s|$OTHER_UNZIPDIR| |g" > $WORK_DIR/$ZIP_FILE.difflist 477 $CAT $WORK_DIR/$ZIP_FILE.difflist 478 479 if [ -n "$SHOW_DIFFS" ]; then 480 for i in $(cat $WORK_DIR/$ZIP_FILE.difflist) ; do 481 if [ -f "${OTHER_UNZIPDIR}/$i.javap" ]; then 482 LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap 483 elif [ -f "${OTHER_UNZIPDIR}/$i.cleaned" ]; then 484 LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i 485 else 486 LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i 487 fi 488 done 489 fi 490 fi 491 492 return $return_value 493} 494 495 496########################################################################################## 497# Compare all zip files 498 499compare_all_zip_files() { 500 THIS_DIR=$1 501 OTHER_DIR=$2 502 WORK_DIR=$3 503 504 ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.zip" | $SORT | $FILTER ) 505 506 if [ -n "$ZIPS" ]; then 507 echo Zip files... 508 509 return_value=0 510 for f in $ZIPS; do 511 if [ -f "$OTHER_DIR/$f" ]; then 512 compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f 513 if [ "$?" != "0" ]; then 514 return_value=1 515 REGRESSIONS=true 516 fi 517 fi 518 done 519 fi 520 521 return $return_value 522} 523 524########################################################################################## 525# Compare all jar files 526 527compare_all_jar_files() { 528 THIS_DIR=$1 529 OTHER_DIR=$2 530 WORK_DIR=$3 531 532 # TODO filter? 533 ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.jar" -o -name "*.war" \ 534 -o -name "*.jimage" | $SORT | $FILTER) 535 536 if [ -n "$ZIPS" ]; then 537 echo Jar files... 538 539 return_value=0 540 for f in $ZIPS; do 541 if [ -f "$OTHER_DIR/$f" ]; then 542 compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f 543 if [ "$?" != "0" ]; then 544 return_value=1 545 REGRESSIONS=true 546 fi 547 fi 548 done 549 fi 550 551 return $return_value 552} 553 554########################################################################################## 555# Compare binary (executable/library) file 556 557compare_bin_file() { 558 THIS_DIR=$1 559 OTHER_DIR=$2 560 WORK_DIR=$3 561 BIN_FILE=$4 562 OTHER_BIN_FILE=$5 563 564 THIS_FILE=$THIS_DIR/$BIN_FILE 565 if [ -n "$OTHER_BIN_FILE" ]; then 566 OTHER_FILE=$OTHER_DIR/$OTHER_BIN_FILE 567 else 568 OTHER_FILE=$OTHER_DIR/$BIN_FILE 569 fi 570 NAME=$(basename $BIN_FILE) 571 WORK_FILE_BASE=$WORK_DIR/$BIN_FILE 572 FILE_WORK_DIR=$(dirname $WORK_FILE_BASE) 573 574 $MKDIR -p $FILE_WORK_DIR 575 576 ORIG_THIS_FILE="$THIS_FILE" 577 ORIG_OTHER_FILE="$OTHER_FILE" 578 579 if [[ "$STRIP_BEFORE_COMPARE" = *"$BIN_FILE"* ]]; then 580 THIS_STRIPPED_FILE=$FILE_WORK_DIR/this/$NAME 581 OTHER_STRIPPED_FILE=$FILE_WORK_DIR/other/$NAME 582 $MKDIR -p $FILE_WORK_DIR/this $FILE_WORK_DIR/other 583 $CP $THIS_FILE $THIS_STRIPPED_FILE 584 $CP $OTHER_FILE $OTHER_STRIPPED_FILE 585 $STRIP $THIS_STRIPPED_FILE 586 $STRIP $OTHER_STRIPPED_FILE 587 THIS_FILE="$THIS_STRIPPED_FILE" 588 OTHER_FILE="$OTHER_STRIPPED_FILE" 589 fi 590 591 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 592 unset _NT_SYMBOL_PATH 593 # On windows we need to unzip the debug symbols, if present 594 OTHER_FILE_BASE=${OTHER_FILE/.dll/} 595 OTHER_FILE_BASE=${OTHER_FILE_BASE/.exe/} 596 DIZ_NAME=$(basename $OTHER_FILE_BASE).diz 597 # java.exe and java.dll diz files will have the same name. Have to 598 # make sure java.exe gets the right one. This is only needed for 599 # OTHER since in the new build, all pdb files are left around. 600 if [ "$NAME" = "java.exe" ] && [ -f "$OTHER/tmp/java/java/obj64/java.diz" ]; then 601 OTHER_DIZ_FILE="$OTHER/tmp/java/java/obj64/java.diz" 602 elif [ -f "${OTHER_FILE_BASE}.diz" ]; then 603 OTHER_DIZ_FILE=${OTHER_FILE_BASE}.diz 604 else 605 # Some files, jli.dll, appears twice in the image but only one of 606 # thme has a diz file next to it. 607 OTHER_DIZ_FILE="$($FIND $OTHER_DIR -name $DIZ_NAME | $SED 1q)" 608 if [ ! -f "$OTHER_DIZ_FILE" ]; then 609 # As a last resort, look for diz file in the whole build output 610 # dir. 611 OTHER_DIZ_FILE="$($FIND $OTHER -name $DIZ_NAME | $SED 1q)" 612 fi 613 fi 614 if [ -n "$OTHER_DIZ_FILE" ]; then 615 $MKDIR -p $FILE_WORK_DIR/other 616 (cd $FILE_WORK_DIR/other ; $UNARCHIVE -o $OTHER_DIZ_FILE) 617 export _NT_SYMBOL_PATH="$FILE_WORK_DIR/other" 618 fi 619 THIS_FILE_BASE=${THIS_FILE/.dll/} 620 THIS_FILE_BASE=${THIS_FILE_BASE/.exe/} 621 if [ -f "${THIS_FILE/.dll/}.diz" ]; then 622 THIS_DIZ_FILE=${THIS_FILE/.dll/}.diz 623 else 624 THIS_DIZ_FILE="$($FIND $THIS_DIR -name $DIZ_NAME | $SED 1q)" 625 if [ ! -f "$THIS_DIZ_FILE" ]; then 626 # As a last resort, look for diz file in the whole build output 627 # dir. 628 THIS_DIZ_FILE="$($FIND $THIS -name $DIZ_NAME | $SED 1q)" 629 fi 630 fi 631 if [ -n "$THIS_DIZ_FILE" ]; then 632 $MKDIR -p $FILE_WORK_DIR/this 633 (cd $FILE_WORK_DIR/this ; $UNARCHIVE -o $THIS_DIZ_FILE) 634 export _NT_SYMBOL_PATH="$_NT_SYMBOL_PATH;$FILE_WORK_DIR/this" 635 fi 636 fi 637 638 if [ -z "$SKIP_BIN_DIFF" ]; then 639 if cmp $OTHER_FILE $THIS_FILE > /dev/null; then 640 # The files were bytewise identical. 641 if [ -n "$VERBOSE" ]; then 642 echo " : : : : : : $BIN_FILE" 643 fi 644 return 0 645 fi 646 BIN_MSG=" diff " 647 if [[ "$ACCEPTED_BIN_DIFF" != *"$BIN_FILE"* ]]; then 648 DIFF_BIN=true 649 if [[ "$KNOWN_BIN_DIFF" != *"$BIN_FILE"* ]]; then 650 BIN_MSG="*$BIN_MSG*" 651 REGRESSIONS=true 652 else 653 BIN_MSG=" $BIN_MSG " 654 fi 655 else 656 BIN_MSG="($BIN_MSG)" 657 DIFF_BIN= 658 fi 659 fi 660 661 if [ -n "$STAT" ]; then 662 THIS_SIZE=$($STAT $STAT_PRINT_SIZE "$THIS_FILE") 663 OTHER_SIZE=$($STAT $STAT_PRINT_SIZE "$OTHER_FILE") 664 else 665 THIS_SIZE=$(ls -l "$THIS_FILE" | awk '{ print $5 }') 666 OTHER_SIZE=$(ls -l "$OTHER_FILE" | awk '{ print $5 }') 667 fi 668 if [ $THIS_SIZE -ne $OTHER_SIZE ]; then 669 DIFF_SIZE_NUM=$($EXPR $THIS_SIZE - $OTHER_SIZE) 670 DIFF_SIZE_REL=$($EXPR $THIS_SIZE \* 100 / $OTHER_SIZE) 671 SIZE_MSG=$($PRINTF "%3d%% %4d" $DIFF_SIZE_REL $DIFF_SIZE_NUM) 672 if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_REL" -gt 98 ] \ 673 && [ "$DIFF_SIZE_REL" -lt 102 ]; then 674 SIZE_MSG="($SIZE_MSG)" 675 DIFF_SIZE= 676 elif [ "$OPENJDK_TARGET_OS" = "windows" ] \ 677 && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \ 678 && [ "$DIFF_SIZE_NUM" = 512 ]; then 679 # On windows, size of binaries increase in 512 increments. 680 SIZE_MSG="($SIZE_MSG)" 681 DIFF_SIZE= 682 elif [ "$OPENJDK_TARGET_OS" = "windows" ] \ 683 && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \ 684 && [ "$DIFF_SIZE_NUM" = -512 ]; then 685 # On windows, size of binaries increase in 512 increments. 686 SIZE_MSG="($SIZE_MSG)" 687 DIFF_SIZE= 688 else 689 if [[ "$ACCEPTED_SIZE_DIFF" != *"$BIN_FILE"* ]]; then 690 DIFF_SIZE=true 691 if [[ "$KNOWN_SIZE_DIFF" != *"$BIN_FILE"* ]]; then 692 SIZE_MSG="*$SIZE_MSG*" 693 REGRESSIONS=true 694 else 695 SIZE_MSG=" $SIZE_MSG " 696 fi 697 else 698 SIZE_MSG="($SIZE_MSG)" 699 DIFF_SIZE= 700 fi 701 fi 702 else 703 SIZE_MSG=" " 704 DIFF_SIZE= 705 if [[ "$KNOWN_SIZE_DIFF $ACCEPTED_SIZE_DIFF" = *"$BIN_FILE"* ]]; then 706 SIZE_MSG=" ! " 707 fi 708 fi 709 710 if [[ "$SORT_SYMBOLS" = *"$BIN_FILE"* ]]; then 711 SYM_SORT_CMD="sort" 712 else 713 SYM_SORT_CMD="cat" 714 fi 715 716 # Check symbols 717 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 718 # The output from dumpbin on windows differs depending on if the debug symbol 719 # files are still around at the location the binary is pointing too. Need 720 # to filter out that extra information. 721 $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 722 $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 723 elif [ "$OPENJDK_TARGET_OS" = "solaris" ]; then 724 # Some symbols get seemingly random 15 character prefixes. Filter them out. 725 $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 726 $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 727 else 728 $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 729 $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 730 fi 731 732 LC_ALL=C $DIFF $WORK_FILE_BASE.symbols.other $WORK_FILE_BASE.symbols.this > $WORK_FILE_BASE.symbols.diff 733 if [ -s $WORK_FILE_BASE.symbols.diff ]; then 734 SYM_MSG=" diff " 735 if [[ "$ACCEPTED_SYM_DIFF" != *"$BIN_FILE"* ]]; then 736 DIFF_SYM=true 737 if [[ "$KNOWN_SYM_DIFF" != *"$BIN_FILE"* ]]; then 738 SYM_MSG="*$SYM_MSG*" 739 REGRESSIONS=true 740 else 741 SYM_MSG=" $SYM_MSG " 742 fi 743 else 744 SYM_MSG="($SYM_MSG)" 745 DIFF_SYM= 746 fi 747 else 748 SYM_MSG=" " 749 DIFF_SYM= 750 if [[ "$KNOWN_SYM_DIFF $ACCEPTED_SYM_DIFF" = *"$BIN_FILE"* ]]; then 751 SYM_MSG=" ! " 752 fi 753 fi 754 755 # Check dependencies 756 if [ -n "$LDD_CMD" ]; then 757 (cd $FILE_WORK_DIR && $CP $OTHER_FILE . && $LDD_CMD $NAME 2>/dev/null | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.other | $UNIQ > $WORK_FILE_BASE.deps.other.uniq) 758 (cd $FILE_WORK_DIR && $CP $THIS_FILE . && $LDD_CMD $NAME 2</dev/null | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.this | $UNIQ > $WORK_FILE_BASE.deps.this.uniq) 759 (cd $FILE_WORK_DIR && $RM -f $NAME) 760 761 LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other $WORK_FILE_BASE.deps.this > $WORK_FILE_BASE.deps.diff 762 LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other.uniq $WORK_FILE_BASE.deps.this.uniq > $WORK_FILE_BASE.deps.diff.uniq 763 764 if [ -s $WORK_FILE_BASE.deps.diff ]; then 765 if [ -s $WORK_FILE_BASE.deps.diff.uniq ]; then 766 DEP_MSG=" diff " 767 else 768 DEP_MSG=" redun " 769 fi 770 if [[ "$ACCEPTED_DEP_DIFF" != *"$BIN_FILE"* ]]; then 771 DIFF_DEP=true 772 if [[ "$KNOWN_DEP_DIFF" != *"$BIN_FILE"* ]]; then 773 DEP_MSG="*$DEP_MSG*" 774 REGRESSIONS=true 775 else 776 DEP_MSG=" $DEP_MSG " 777 fi 778 else 779 DEP_MSG="($DEP_MSG)" 780 DIFF_DEP= 781 fi 782 else 783 DEP_MSG=" " 784 DIFF_DEP= 785 if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then 786 DEP_MSG=" ! " 787 fi 788 fi 789 else 790 DEP_MSG=" - " 791 fi 792 793 # Compare fulldump output 794 if [ -n "$FULLDUMP_CMD" ] && [ -z "$SKIP_FULLDUMP_DIFF" ]; then 795 $FULLDUMP_CMD $OTHER_FILE > $WORK_FILE_BASE.fulldump.other 2>&1 796 $FULLDUMP_CMD $THIS_FILE > $WORK_FILE_BASE.fulldump.this 2>&1 797 LC_ALL=C $DIFF $WORK_FILE_BASE.fulldump.other $WORK_FILE_BASE.fulldump.this > $WORK_FILE_BASE.fulldump.diff 798 799 if [ -s $WORK_FILE_BASE.fulldump.diff ]; then 800 ELF_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.fulldump.diff | awk '{print $5}') 801 ELF_MSG=$($PRINTF "%8d" $ELF_DIFF_SIZE) 802 if [[ "$ACCEPTED_ELF_DIFF" != *"$BIN_FILE"* ]]; then 803 DIFF_ELF=true 804 if [[ "$KNOWN_ELF_DIFF" != *"$BIN_FILE"* ]]; then 805 ELF_MSG="*$ELF_MSG*" 806 REGRESSIONS=true 807 else 808 ELF_MSG=" $ELF_MSG " 809 fi 810 else 811 ELF_MSG="($ELF_MSG)" 812 DIFF_ELF= 813 fi 814 else 815 ELF_MSG=" " 816 DIFF_ELF= 817 if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then 818 ELF_MSG=" ! " 819 fi 820 fi 821 fi 822 823 # Compare disassemble output 824 if [ -n "$DIS_CMD" ] && [ -z "$SKIP_DIS_DIFF" ]; then 825 if [ -z "$DIS_DIFF_FILTER" ]; then 826 DIS_DIFF_FILTER="$CAT" 827 fi 828 $DIS_CMD $OTHER_FILE | $GREP -v $NAME | $DIS_DIFF_FILTER > $WORK_FILE_BASE.dis.other 2>&1 829 $DIS_CMD $THIS_FILE | $GREP -v $NAME | $DIS_DIFF_FILTER > $WORK_FILE_BASE.dis.this 2>&1 830 831 LC_ALL=C $DIFF $WORK_FILE_BASE.dis.other $WORK_FILE_BASE.dis.this > $WORK_FILE_BASE.dis.diff 832 833 if [ -s $WORK_FILE_BASE.dis.diff ]; then 834 DIS_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.dis.diff | awk '{print $5}') 835 DIS_MSG=$($PRINTF "%8d" $DIS_DIFF_SIZE) 836 if [[ "$ACCEPTED_DIS_DIFF" != *"$BIN_FILE"* ]]; then 837 DIFF_DIS=true 838 if [[ "$KNOWN_DIS_DIFF" != *"$BIN_FILE"* ]]; then 839 DIS_MSG="*$DIS_MSG*" 840 REGRESSIONS=true 841 else 842 DIS_MSG=" $DIS_MSG " 843 fi 844 else 845 DIS_MSG="($DIS_MSG)" 846 DIFF_DIS= 847 fi 848 else 849 DIS_MSG=" " 850 DIFF_DIS= 851 if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then 852 DIS_MSG=" ! " 853 fi 854 fi 855 fi 856 857 858 if [ -n "$DIFF_BIN$DIFF_SIZE$DIFF_SYM$DIFF_DEP$DIFF_ELF$DIFF_DIS" ] || [ -n "$VERBOSE" ]; then 859 if [ -n "$BIN_MSG" ]; then echo -n "$BIN_MSG:"; fi 860 if [ -n "$SIZE_MSG" ]; then echo -n "$SIZE_MSG:"; fi 861 if [ -n "$SYM_MSG" ]; then echo -n "$SYM_MSG:"; fi 862 if [ -n "$DEP_MSG" ]; then echo -n "$DEP_MSG:"; fi 863 if [ -n "$ELF_MSG" ]; then echo -n "$ELF_MSG:"; fi 864 if [ -n "$DIS_MSG" ]; then echo -n "$DIS_MSG:"; fi 865 echo " $BIN_FILE" 866 if [ "$SHOW_DIFFS" = "true" ]; then 867 if [ -s "$WORK_FILE_BASE.symbols.diff" ]; then 868 echo "Symbols diff:" 869 $CAT $WORK_FILE_BASE.symbols.diff 870 fi 871 if [ -s "$WORK_FILE_BASE.deps.diff" ]; then 872 echo "Deps diff:" 873 $CAT $WORK_FILE_BASE.deps.diff 874 fi 875 if [ -s "$WORK_FILE_BASE.fulldump.diff" ]; then 876 echo "Fulldump diff:" 877 $CAT $WORK_FILE_BASE.fulldump.diff 878 fi 879 if [ -s "$WORK_FILE_BASE.dis.diff" ]; then 880 echo "Disassembly diff:" 881 $CAT $WORK_FILE_BASE.dis.diff 882 fi 883 fi 884 return 1 885 fi 886 return 0 887} 888 889########################################################################################## 890# Print binary diff header 891 892print_binary_diff_header() { 893 if [ -z "$SKIP_BIN_DIFF" ]; then echo -n " Binary :"; fi 894 if [ -z "$SKIP_SIZE_DIFF" ]; then echo -n " Size :"; fi 895 if [ -z "$SKIP_SYM_DIFF" ]; then echo -n " Symbols :"; fi 896 if [ -z "$SKIP_DEP_DIFF" ]; then echo -n " Deps :"; fi 897 if [ -z "$SKIP_FULLDUMP_DIFF" ]; then echo -n " Fulldump :"; fi 898 if [ -z "$SKIP_DIS_DIFF" ]; then echo -n " Disass :"; fi 899 echo 900} 901 902########################################################################################## 903# Compare all libraries 904 905compare_all_libs() { 906 THIS_DIR=$1 907 OTHER_DIR=$2 908 WORK_DIR=$3 909 910 LIBS=$(cd $THIS_DIR && $FIND . -type f \( -name 'lib*.so' -o -name '*.dylib' -o -name '*.dll' -o -name 'JavaControlPanel' \) | $SORT | $FILTER) 911 912 if [ -n "$LIBS" ]; then 913 echo Libraries... 914 print_binary_diff_header 915 for l in $LIBS; do 916 if [ -f "$OTHER_DIR/$l" ]; then 917 compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $l 918 if [ "$?" != "0" ]; then 919 return_value=1 920 fi 921 fi 922 done 923 fi 924 925 return $return_value 926} 927 928########################################################################################## 929# Compare all executables 930 931compare_all_execs() { 932 THIS_DIR=$1 933 OTHER_DIR=$2 934 WORK_DIR=$3 935 936 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 937 EXECS=$(cd $THIS_DIR && $FIND . -type f -name '*.exe' | $SORT | $FILTER) 938 else 939 EXECS=$(cd $THIS_DIR && $FIND . -name db -prune -o -type f -perm -100 \! \ 940 \( -name '*.so' -o -name '*.dylib' -o -name '*.dll' -o -name '*.cgi' \ 941 -o -name '*.jar' -o -name '*.diz' -o -name 'jcontrol' -o -name '*.properties' \ 942 -o -name '*.data' -o -name '*.bfc' -o -name '*.src' -o -name '*.txt' \ 943 -o -name '*.cfg' -o -name 'meta-index' -o -name '*.properties.ja' \ 944 -o -name 'classlist' \) | $SORT | $FILTER) 945 fi 946 947 if [ -n "$EXECS" ]; then 948 echo Executables... 949 print_binary_diff_header 950 for e in $EXECS; do 951 if [ -f "$OTHER_DIR/$e" ]; then 952 compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $e 953 if [ "$?" != "0" ]; then 954 return_value=1 955 fi 956 fi 957 done 958 fi 959 960 return $return_value 961} 962 963########################################################################################## 964# Initiate configuration 965 966COMPARE_ROOT=/tmp/cimages.$USER 967$MKDIR -p $COMPARE_ROOT 968if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 969 if [ "$(uname -o)" = "Cygwin" ]; then 970 COMPARE_ROOT=$(cygpath -msa $COMPARE_ROOT) 971 fi 972fi 973 974THIS="$( cd "$( dirname "$0" )" && pwd )" 975echo "$THIS" 976THIS_SCRIPT="$0" 977 978if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1" = "/?" ] || [ "$1" = "-help" ] || [ "$1" = "--help" ]; then 979 echo "bash ./compare.sh [OPTIONS] [FILTER]" 980 echo "" 981 echo "-all Compare all files in all known ways" 982 echo "-names Compare the file names and directory structure" 983 echo "-perms Compare the permission bits on all files and directories" 984 echo "-types Compare the output of the file command on all files" 985 echo "-general Compare the files not convered by the specialized comparisons" 986 echo "-zips Compare the contents of all zip files" 987 echo "-jars Compare the contents of all jar files" 988 echo "-libs Compare all native libraries" 989 echo "-execs Compare all executables" 990 echo "-v Verbose output, does not hide known differences" 991 echo "-vv More verbose output, shows diff output of all comparisons" 992 echo "-o [OTHER] Compare with build in other directory. Will default to the old build directory" 993 echo "" 994 echo "[FILTER] List filenames in the image to compare, works for jars, zips, libs and execs" 995 echo "Example:" 996 echo "bash ./common/bin/compareimages.sh CodePointIM.jar" 997 echo "" 998 echo "-2zips <file1> <file2> Compare two zip files only" 999 echo "-2bins <file1> <file2> Compare two binary files only" 1000 echo "-2dirs <dir1> <dir2> Compare two directories as if they were images" 1001 echo "" 1002 exit 10 1003fi 1004 1005CMP_NAMES=false 1006CMP_PERMS=false 1007CMP_TYPES=false 1008CMP_GENERAL=false 1009CMP_ZIPS=false 1010CMP_JARS=false 1011CMP_LIBS=false 1012CMP_EXECS=false 1013 1014while [ -n "$1" ]; do 1015 case "$1" in 1016 -v) 1017 VERBOSE=true 1018 ;; 1019 -vv) 1020 VERBOSE=true 1021 SHOW_DIFFS=true 1022 ;; 1023 -o) 1024 OTHER="$2" 1025 shift 1026 ;; 1027 -all) 1028 CMP_NAMES=true 1029 if [ "$OPENJDK_TARGET_OS" != "windows" ]; then 1030 CMP_PERMS=true 1031 fi 1032 CMP_TYPES=true 1033 CMP_GENERAL=true 1034 CMP_ZIPS=true 1035 CMP_JARS=true 1036 CMP_LIBS=true 1037 CMP_EXECS=true 1038 ;; 1039 -names) 1040 CMP_NAMES=true 1041 ;; 1042 -perms) 1043 CMP_PERMS=true 1044 ;; 1045 -types) 1046 CMP_TYPES=true 1047 ;; 1048 -general) 1049 CMP_GENERAL=true 1050 ;; 1051 -zips) 1052 CMP_ZIPS=true 1053 ;; 1054 -jars) 1055 CMP_JARS=true 1056 ;; 1057 -libs) 1058 CMP_LIBS=true 1059 ;; 1060 -execs) 1061 CMP_EXECS=true 1062 ;; 1063 -2dirs) 1064 THIS="$(cd "$2" && pwd )" 1065 OTHER="$(cd "$3" && pwd )" 1066 THIS_BASE_DIR="$THIS" 1067 OTHER_BASE_DIR="$OTHER" 1068 SKIP_DEFAULT=true 1069 shift 1070 shift 1071 ;; 1072 -2zips) 1073 CMP_2_ZIPS=true 1074 THIS_FILE=$2 1075 OTHER_FILE=$3 1076 shift 1077 shift 1078 ;; 1079 -2bins) 1080 CMP_2_BINS=true 1081 THIS_FILE=$2 1082 OTHER_FILE=$3 1083 shift 1084 shift 1085 ;; 1086 *) 1087 CMP_NAMES=false 1088 CMP_PERMS=false 1089 CMP_TYPES=false 1090 CMP_ZIPS=true 1091 CMP_JARS=true 1092 CMP_LIBS=true 1093 CMP_EXECS=true 1094 1095 if [ -z "$FILTER" ]; then 1096 FILTER="$GREP" 1097 fi 1098 FILTER="$FILTER -e $1" 1099 ;; 1100 esac 1101 shift 1102done 1103 1104if [ "$CMP_2_ZIPS" = "true" ]; then 1105 THIS_DIR="$(dirname $THIS_FILE)" 1106 THIS_DIR="$(cd "$THIS_DIR" && pwd )" 1107 OTHER_DIR="$(dirname $OTHER_FILE)" 1108 OTHER_DIR="$(cd "$OTHER_DIR" && pwd )" 1109 THIS_FILE_NAME="$(basename $THIS_FILE)" 1110 OTHER_FILE_NAME="$(basename $OTHER_FILE)" 1111 echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME 1112 compare_zip_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2zips $THIS_FILE_NAME $OTHER_FILE_NAME 1113 exit 1114fi 1115 1116if [ "$CMP_2_BINS" = "true" ]; then 1117 THIS_DIR="$(dirname $THIS_FILE)" 1118 THIS_DIR="$(cd "$THIS_DIR" && pwd )" 1119 OTHER_DIR="$(dirname $OTHER_FILE)" 1120 OTHER_DIR="$(cd "$OTHER_DIR" && pwd )" 1121 THIS_FILE_NAME="$(basename $THIS_FILE)" 1122 OTHER_FILE_NAME="$(basename $OTHER_FILE)" 1123 echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME 1124 compare_bin_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2bins $THIS_FILE_NAME $OTHER_FILE_NAME 1125 exit 1126fi 1127 1128if [ "$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 1129 CMP_NAMES=true 1130 CMP_PERMS=true 1131 CMP_TYPES=true 1132 CMP_GENERAL=true 1133 CMP_ZIPS=true 1134 CMP_JARS=true 1135 CMP_LIBS=true 1136 CMP_EXECS=true 1137fi 1138 1139if [ -z "$FILTER" ]; then 1140 FILTER="$CAT" 1141fi 1142 1143if [ "$SKIP_DEFAULT" != "true" ]; then 1144 if [ -z "$OTHER" ]; then 1145 echo "Nothing to compare to, set with -o" 1146 exit 1 1147 else 1148 if [ ! -d "$OTHER" ]; then 1149 echo "Other build directory does not exist:" 1150 echo "$OTHER" 1151 exit 1 1152 fi 1153 OTHER="$( cd "$OTHER" && pwd )" 1154 echo "Comparing to:" 1155 echo "$OTHER" 1156 echo 1157 fi 1158 1159 1160 # Find the common images to compare, prioritizing later build stages 1161 if [ -d "$THIS/install/jdk" ] && [ -d "$OTHER/install/jdk" ]; then 1162 THIS_J2SDK="$THIS/install/jdk" 1163 THIS_J2RE="$THIS/install/jre" 1164 OTHER_J2SDK="$OTHER/install/jdk" 1165 OTHER_J2RE="$OTHER/install/jre" 1166 echo "Selecting install images for compare" 1167 elif [ -d "$THIS/deploy/jdk" ] && [ -d "$OTHER/deploy/jdk" ]; then 1168 THIS_J2SDK="$THIS/deploy/jdk" 1169 THIS_J2RE="$THIS/deploy/jre" 1170 OTHER_J2SDK="$OTHER/deploy/jdk" 1171 OTHER_J2RE="$OTHER/deploy/jre" 1172 echo "Selecting deploy images for compare" 1173 elif [ -d "$THIS/images/jdk" ] && [ -d "$OTHER/images/jdk" ]; then 1174 THIS_J2SDK="$THIS/images/jdk" 1175 THIS_J2RE="$THIS/images/jre" 1176 OTHER_J2SDK="$OTHER/images/jdk" 1177 OTHER_J2RE="$OTHER/images/jre" 1178 echo "Selecting jdk images for compare" 1179 else 1180 echo "No common images found." 1181 exit 1 1182 fi 1183 1184 if [ -d "$THIS/images/jdk-bundle" ] && [ -d "$OTHER/images/jdk-bundle" ]; then 1185 THIS_J2SDK_BUNDLE="$THIS/images/jdk-bundle" 1186 THIS_J2RE_BUNDLE="$THIS/images/jre-bundle" 1187 OTHER_J2SDK_BUNDLE="$OTHER/images/jdk-bundle" 1188 OTHER_J2RE_BUNDLE="$OTHER/images/jre-bundle" 1189 echo "Also comparing macosx bundles" 1190 fi 1191 1192 if [ -d "$OTHER/images" ]; then 1193 OTHER_SEC_DIR="$OTHER/images" 1194 else 1195 OTHER_SEC_DIR="$OTHER/tmp" 1196 fi 1197 OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip" 1198 THIS_SEC_DIR="$THIS/images" 1199 THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip" 1200 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 1201 if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then 1202 JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip" 1203 else 1204 JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip" 1205 fi 1206 OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip" 1207 OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN" 1208 THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip" 1209 THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN" 1210 fi 1211 1212 if [ -d "$THIS/docs" ] && [ -d "$OTHER/docs" ]; then 1213 THIS_DOCS="$THIS/docs" 1214 OTHER_DOCS="$OTHER/docs" 1215 echo "Also comparing docs" 1216 else 1217 echo "WARNING! Docs haven't been built and won't be compared." 1218 fi 1219fi 1220 1221########################################################################################## 1222# Do the work 1223 1224if [ "$CMP_NAMES" = "true" ]; then 1225 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1226 echo -n "J2SDK " 1227 compare_dirs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1228 echo -n "J2RE " 1229 compare_dirs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1230 1231 echo -n "J2SDK " 1232 compare_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1233 echo -n "J2RE " 1234 compare_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1235 fi 1236 if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then 1237 echo -n "J2SDK Bundle " 1238 compare_dirs $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/jdk-bundle 1239 echo -n "J2RE Bundle " 1240 compare_dirs $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/jre-bundle 1241 1242 echo -n "J2SDK Bundle " 1243 compare_files $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/jdk-bundle 1244 echo -n "J2RE Bundle " 1245 compare_files $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/jre-bundle 1246 fi 1247 if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then 1248 echo -n "Docs " 1249 compare_dirs $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs 1250 echo -n "Docs " 1251 compare_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs 1252 fi 1253 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1254 compare_dirs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1255 compare_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1256 fi 1257fi 1258 1259if [ "$CMP_PERMS" = "true" ]; then 1260 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1261 echo -n "J2SDK " 1262 compare_permissions $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1263 echo -n "J2RE " 1264 compare_permissions $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1265 fi 1266 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1267 compare_permissions $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1268 fi 1269fi 1270 1271if [ "$CMP_TYPES" = "true" ]; then 1272 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1273 echo -n "J2SDK " 1274 compare_file_types $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1275 echo -n "J2RE " 1276 compare_file_types $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1277 fi 1278 if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then 1279 echo -n "J2SDK Bundle " 1280 compare_file_types $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/jdk-bundle 1281 echo -n "J2RE Bundle " 1282 compare_file_types $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/jre-bundle 1283 fi 1284 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1285 compare_file_types $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1286 fi 1287fi 1288 1289if [ "$CMP_GENERAL" = "true" ]; then 1290 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1291 echo -n "J2SDK " 1292 compare_general_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1293 echo -n "J2RE " 1294 compare_general_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1295 fi 1296 if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then 1297 echo -n "J2SDK Bundle " 1298 compare_general_files $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/jdk-bundle 1299 echo -n "J2RE Bundle " 1300 compare_general_files $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/jre-bundle 1301 fi 1302 if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then 1303 echo -n "Docs " 1304 compare_general_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs 1305 fi 1306 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1307 compare_general_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1308 fi 1309fi 1310 1311if [ "$CMP_ZIPS" = "true" ]; then 1312 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1313 compare_all_zip_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1314 fi 1315 if [ -n "$THIS_SEC_BIN" ] && [ -n "$OTHER_SEC_BIN" ]; then 1316 if [ -n "$(echo $THIS_SEC_BIN | $FILTER)" ]; then 1317 echo "sec-bin.zip..." 1318 compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-bin.zip 1319 fi 1320 fi 1321 if [ -n "$THIS_SEC_WINDOWS_BIN" ] && [ -n "$OTHER_SEC_WINDOWS_BIN" ]; then 1322 if [ -n "$(echo $THIS_SEC_WINDOWS_BIN | $FILTER)" ]; then 1323 echo "sec-windows-bin.zip..." 1324 compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-windows-bin.zip 1325 fi 1326 fi 1327 if [ -n "$THIS_JGSS_WINDOWS_BIN" ] && [ -n "$OTHER_JGSS_WINDOWS_BIN" ]; then 1328 if [ -n "$(echo $THIS_JGSS_WINDOWS_BIN | $FILTER)" ]; then 1329 echo "$JGSS_WINDOWS_BIN..." 1330 compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin $JGSS_WINDOWS_BIN 1331 fi 1332 fi 1333 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1334 compare_all_zip_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1335 fi 1336fi 1337 1338if [ "$CMP_JARS" = "true" ]; then 1339 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1340 compare_all_jar_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1341 fi 1342 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1343 compare_all_jar_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1344 fi 1345fi 1346 1347if [ "$CMP_LIBS" = "true" ]; then 1348 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1349 echo -n "J2SDK " 1350 compare_all_libs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1351 if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then 1352 echo -n "J2RE " 1353 compare_all_libs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1354 fi 1355 fi 1356 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1357 compare_all_libs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1358 fi 1359fi 1360 1361if [ "$CMP_EXECS" = "true" ]; then 1362 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1363 compare_all_execs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1364 fi 1365 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1366 compare_all_execs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1367 fi 1368fi 1369 1370echo 1371 1372if [ -n "$REGRESSIONS" ]; then 1373 echo "REGRESSIONS FOUND!" 1374 echo 1375 exit 1 1376else 1377 echo "No regressions found" 1378 echo 1379 exit 0 1380fi 1381