aoqi@0: #!/bin/bash aoqi@0: # aoqi@0: # Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. aoqi@0: # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. aoqi@0: # aoqi@0: # This code is free software; you can redistribute it and/or modify it aoqi@0: # under the terms of the GNU General Public License version 2 only, as aoqi@0: # published by the Free Software Foundation. aoqi@0: # aoqi@0: # This code is distributed in the hope that it will be useful, but WITHOUT aoqi@0: # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or aoqi@0: # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License aoqi@0: # version 2 for more details (a copy is included in the LICENSE file that aoqi@0: # accompanied this code). aoqi@0: # aoqi@0: # You should have received a copy of the GNU General Public License version aoqi@0: # 2 along with this work; if not, write to the Free Software Foundation, aoqi@0: # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. aoqi@0: # aoqi@0: # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA aoqi@0: # or visit www.oracle.com if you need additional information or have any aoqi@0: # questions. aoqi@0: # aoqi@0: aoqi@0: # This script is processed by configure before it's usable. It is run from aoqi@0: # the root of the build directory. aoqi@0: aoqi@0: aoqi@0: ########################################################################################## aoqi@0: aoqi@0: # Check that we are run via the wrapper generated by configure aoqi@0: if [ -z "$SRC_ROOT" ]; then aoqi@0: echo "Error: You must run this script using build/[conf]/compare.sh" aoqi@0: exit 1 aoqi@0: fi aoqi@0: aoqi@0: if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then aoqi@0: FULLDUMP_CMD="$OTOOL -v -V -h -X -t -d" aoqi@0: LDD_CMD="$OTOOL -L" aoqi@0: DIS_CMD="$OTOOL -v -t" aoqi@0: STAT_PRINT_SIZE="-f %z" aoqi@0: elif [ "$OPENJDK_TARGET_OS" = "windows" ]; then aoqi@0: FULLDUMP_CMD="$DUMPBIN -all" aoqi@0: LDD_CMD="$DUMPBIN -dependants | $GREP .dll" aoqi@0: DIS_CMD="$DUMPBIN -disasm:nobytes" aoqi@0: STAT_PRINT_SIZE="-c %s" aoqi@0: else aoqi@0: FULLDUMP_CMD="$READELF -a" aoqi@0: LDD_CMD="$LDD" aoqi@0: DIS_CMD="$OBJDUMP -d" aoqi@0: STAT_PRINT_SIZE="-c %s" aoqi@0: fi aoqi@0: aoqi@0: UNARCHIVE="$UNZIP -q" aoqi@0: aoqi@0: COMPARE_EXCEPTIONS_INCLUDE="$SRC_ROOT/common/bin/compare_exceptions.sh.incl" aoqi@0: if [ ! -e "$COMPARE_EXCEPTIONS_INCLUDE" ]; then aoqi@0: echo "Error: Cannot locate the exceptions file, it should have been here: $COMPARE_EXCEPTIONS_INCLUDE" aoqi@0: exit 1 aoqi@0: fi aoqi@0: # Include exception definitions aoqi@0: . "$COMPARE_EXCEPTIONS_INCLUDE" aoqi@0: aoqi@0: ########################################################################################## aoqi@0: # Compare text files and ignore specific differences: aoqi@0: # aoqi@0: # * Timestamps in Java sources generated by idl2java aoqi@0: # * Sorting order and cleanup style in .properties files aoqi@0: aoqi@0: diff_text() { aoqi@0: OTHER_FILE=$1 aoqi@0: THIS_FILE=$2 aoqi@0: aoqi@0: SUFFIX="${THIS_FILE##*.}" aoqi@0: aoqi@0: TMP=1 aoqi@0: aoqi@0: if [[ "$THIS_FILE" = *"META-INF/MANIFEST.MF" ]]; then aoqi@0: TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \ aoqi@0: $GREP '^[<>]' | \ aoqi@0: $SED -e '/[<>] Ant-Version: Apache Ant .*/d' \ aoqi@0: -e '/[<>] Created-By: .* (Oracle Corporation).*/d') aoqi@0: fi aoqi@0: if test "x$SUFFIX" = "xjava"; then aoqi@0: TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \ aoqi@0: $GREP '^[<>]' | \ aoqi@0: $SED -e '/[<>] \* from.*\.idl/d' \ aoqi@0: -e '/[<>] \*.*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \ aoqi@0: -e '/[<>] \*.*[0-9]\{4\} [0-9][0-9]*:[0-9]\{2\}:[0-9]\{2\}.*/d' \ aoqi@0: -e '/\/\/ Generated from input file.*/d' \ aoqi@0: -e '/\/\/ This file was generated AUTOMATICALLY from a template file.*/d' \ aoqi@0: -e '/\/\/ java GenerateCharacter.*/d') aoqi@0: fi aoqi@0: # Ignore date strings in class files. aoqi@0: # On Macosx the system sources for generated java classes produce different output on aoqi@0: # consequtive invokations seemingly randomly. aoqi@0: # For example a method parameter randomly named "thePoint" or "aPoint". Ignore this. aoqi@0: if test "x$SUFFIX" = "xclass"; then aoqi@0: # To improve performance when large diffs are found, do a rough filtering of classes aoqi@0: # elibeble for these exceptions aoqi@0: if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' \ aoqi@0: -e '[0-9]\{2\}/[0-9]\{2\}/[0-9]\{4\}' \ aoqi@0: -e thePoint -e aPoint -e setItemsPtr ${THIS_FILE} > /dev/null; then aoqi@0: $JAVAP -c -constants -l -p ${OTHER_FILE} > ${OTHER_FILE}.javap aoqi@0: $JAVAP -c -constants -l -p ${THIS_FILE} > ${THIS_FILE}.javap aoqi@0: TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \ aoqi@0: $GREP '^[<>]' | \ aoqi@0: $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \ aoqi@0: -e '/[0-9]\{2\}\/[0-9]\{2\}\/[0-9]\{4\}/d' \ aoqi@0: -e '/[<>].*Point Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \ aoqi@0: -e '/[<>].*public com\.apple\.jobjc\.Pointer].*public void setItemsPtr(com\.apple\.jobjc\.Pointer $OTHER_FILE.cleaned aoqi@0: # Disable this exception since we aren't changing the properties cleaning method yet. aoqi@0: # $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \ aoqi@0: # | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \ aoqi@0: # | $SED -e '/^#/d' -e '/^$/d' \ aoqi@0: # -e :a -e '/\\$/N; s/\\\n//; ta' \ aoqi@0: # -e 's/^[ \t]*//;s/[ \t]*$//' \ aoqi@0: # -e 's/\\=/=/' | LC_ALL=C $SORT > $OTHER_FILE.cleaned aoqi@0: TMP=$(LC_ALL=C $DIFF $OTHER_FILE.cleaned $THIS_FILE) aoqi@0: fi aoqi@0: if test -n "$TMP"; then aoqi@0: echo Files $OTHER_FILE and $THIS_FILE differ aoqi@0: return 1 aoqi@0: fi aoqi@0: aoqi@0: return 0 aoqi@0: } aoqi@0: aoqi@0: ########################################################################################## aoqi@0: # Compare directory structure aoqi@0: aoqi@0: compare_dirs() { aoqi@0: THIS_DIR=$1 aoqi@0: OTHER_DIR=$2 aoqi@0: WORK_DIR=$3 aoqi@0: aoqi@0: mkdir -p $WORK_DIR aoqi@0: aoqi@0: (cd $OTHER_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_other) aoqi@0: (cd $THIS_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_this) aoqi@0: aoqi@0: $DIFF $WORK_DIR/dirs_other $WORK_DIR/dirs_other > $WORK_DIR/dirs_diff aoqi@0: aoqi@0: echo -n Directory structure... aoqi@0: if [ -s $WORK_DIR/dirs_diff ]; then aoqi@0: echo Differences found. aoqi@0: REGRESSIONS=true aoqi@0: # Differences in directories found. aoqi@0: ONLY_OTHER=$($GREP '<' $WORK_DIR/dirs_diff) aoqi@0: if [ "$ONLY_OTHER" ]; then aoqi@0: echo Only in $OTHER aoqi@0: $GREP '<' $WORK_DIR/dirs_diff | $SED 's|< ./| |g' aoqi@0: fi aoqi@0: ONLY_THIS=$($GREP '>' $WORK_DIR/dirs_diff) aoqi@0: if [ "$ONLY_THIS" ]; then aoqi@0: echo Only in $THIS aoqi@0: $GREP '>' $WORK_DIR/dirs_diff | $SED 's|> ./| |g' aoqi@0: fi aoqi@0: else aoqi@0: echo Identical! aoqi@0: fi aoqi@0: } aoqi@0: aoqi@0: aoqi@0: ########################################################################################## aoqi@0: # Compare file structure aoqi@0: aoqi@0: compare_files() { aoqi@0: THIS_DIR=$1 aoqi@0: OTHER_DIR=$2 aoqi@0: WORK_DIR=$3 aoqi@0: aoqi@0: $MKDIR -p $WORK_DIR aoqi@0: aoqi@0: (cd $OTHER_DIR && $FIND . ! -type d | $SORT > $WORK_DIR/files_other) aoqi@0: (cd $THIS_DIR && $FIND . ! -type d | $SORT > $WORK_DIR/files_this) aoqi@0: aoqi@0: $DIFF $WORK_DIR/files_other $WORK_DIR/files_this > $WORK_DIR/files_diff aoqi@0: aoqi@0: echo -n File names... aoqi@0: if [ -s $WORK_DIR/files_diff ]; then aoqi@0: echo Differences found. aoqi@0: REGRESSIONS=true aoqi@0: # Differences in files found. aoqi@0: ONLY_OTHER=$($GREP '<' $WORK_DIR/files_diff) aoqi@0: if [ "$ONLY_OTHER" ]; then aoqi@0: echo Only in $OTHER aoqi@0: $GREP '<' $WORK_DIR/files_diff | $SED 's|< ./| |g' aoqi@0: fi aoqi@0: ONLY_THIS=$($GREP '>' $WORK_DIR/files_diff) aoqi@0: if [ "$ONLY_THIS" ]; then aoqi@0: echo Only in $THIS aoqi@0: $GREP '>' $WORK_DIR/files_diff | $SED 's|> ./| |g' aoqi@0: fi aoqi@0: else aoqi@0: echo Identical! aoqi@0: fi aoqi@0: } aoqi@0: aoqi@0: aoqi@0: ########################################################################################## aoqi@0: # Compare permissions aoqi@0: aoqi@0: compare_permissions() { aoqi@0: THIS_DIR=$1 aoqi@0: OTHER_DIR=$2 aoqi@0: WORK_DIR=$3 aoqi@0: aoqi@0: mkdir -p $WORK_DIR aoqi@0: aoqi@0: echo -n Permissions... aoqi@0: found="" aoqi@0: for f in `cd $OTHER_DIR && $FIND . -type f` aoqi@0: do aoqi@0: if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi aoqi@0: if [ ! -f ${THIS_DIR}/$f ]; then continue; fi aoqi@0: OP=`ls -l ${OTHER_DIR}/$f | awk '{printf("%.10s\n", $1);}'` aoqi@0: TP=`ls -l ${THIS_DIR}/$f | awk '{printf("%.10s\n", $1);}'` aoqi@0: if [ "$OP" != "$TP" ] aoqi@0: then aoqi@0: if [ -z "$found" ]; then echo ; found="yes"; fi aoqi@0: $PRINTF "\told: ${OP} new: ${TP}\t$f\n" aoqi@0: fi aoqi@0: done aoqi@0: if [ -z "$found" ]; then aoqi@0: echo "Identical!" aoqi@0: else aoqi@0: REGRESSIONS=true aoqi@0: fi aoqi@0: } aoqi@0: aoqi@0: ########################################################################################## aoqi@0: # Compare file command output aoqi@0: aoqi@0: compare_file_types() { aoqi@0: THIS_DIR=$1 aoqi@0: OTHER_DIR=$2 aoqi@0: WORK_DIR=$3 aoqi@0: aoqi@0: $MKDIR -p $WORK_DIR aoqi@0: aoqi@0: echo -n File types... aoqi@0: found="" aoqi@0: for f in `cd $OTHER_DIR && $FIND . ! -type d` aoqi@0: do aoqi@0: if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi aoqi@0: if [ ! -f ${THIS_DIR}/$f ]; then continue; fi aoqi@0: OF=`cd ${OTHER_DIR} && $FILE -h $f` aoqi@0: TF=`cd ${THIS_DIR} && $FILE -h $f` aoqi@0: if [ "$f" = "./src.zip" ] || [[ "$f" = *"/Home/src.zip" ]] || [[ "$f" = *"/lib/JObjC.jar" ]] aoqi@0: then aoqi@0: if [ "`echo $OF | $GREP -ic zip`" -gt 0 -a "`echo $TF | $GREP -ic zip`" -gt 0 ] aoqi@0: then aoqi@0: # the way we produces zip-files make it so that directories are stored in old file aoqi@0: # but not in new (only files with full-path) aoqi@0: # this makes file-5.09 report them as different aoqi@0: continue; aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: if [ "$OF" != "$TF" ] aoqi@0: then aoqi@0: if [ -z "$found" ]; then echo ; found="yes"; fi aoqi@0: $PRINTF "\tother: ${OF}\n\tthis : ${TF}\n" aoqi@0: fi aoqi@0: done aoqi@0: if [ -z "$found" ]; then aoqi@0: echo "Identical!" aoqi@0: else aoqi@0: REGRESSIONS=true aoqi@0: fi aoqi@0: } aoqi@0: aoqi@0: ########################################################################################## aoqi@0: # Compare the rest of the files aoqi@0: aoqi@0: compare_general_files() { aoqi@0: THIS_DIR=$1 aoqi@0: OTHER_DIR=$2 aoqi@0: WORK_DIR=$3 aoqi@0: aoqi@0: GENERAL_FILES=$(cd $THIS_DIR && $FIND . -type f ! -name "*.so" ! -name "*.jar" ! -name "*.zip" \ aoqi@0: ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" \ aoqi@0: ! -name "ct.sym" ! -name "*.diz" ! -name "*.dll" \ aoqi@0: ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \ aoqi@0: ! -name "*.lib" ! -name "*.war" ! -name "JavaControlPanel" \ aoqi@0: | $GREP -v "./bin/" | $SORT | $FILTER) aoqi@0: aoqi@0: echo General files... aoqi@0: for f in $GENERAL_FILES aoqi@0: do aoqi@0: if [ -e $OTHER_DIR/$f ]; then aoqi@0: SUFFIX="${f##*.}" aoqi@0: if [ "$(basename $f)" = "release" ]; then aoqi@0: # Ignore differences in change numbers in release file. aoqi@0: OTHER_FILE=$WORK_DIR/$f.other aoqi@0: THIS_FILE=$WORK_DIR/$f.this aoqi@0: $MKDIR -p $(dirname $OTHER_FILE) aoqi@0: $MKDIR -p $(dirname $THIS_FILE) aoqi@0: $CAT $OTHER_DIR/$f | $SED 's/\:[0-9a-f]\{12,12\}/:CHANGE/g' > $OTHER_FILE aoqi@0: $CAT $THIS_DIR/$f | $SED 's/\:[0-9a-f]\{12,12\}/:CHANGE/g' > $THIS_FILE aoqi@0: elif [ "x$SUFFIX" = "xhtml" ]; then aoqi@0: # Ignore time stamps in docs files aoqi@0: OTHER_FILE=$WORK_DIR/$f.other aoqi@0: THIS_FILE=$WORK_DIR/$f.this aoqi@0: $MKDIR -p $(dirname $OTHER_FILE) aoqi@0: $MKDIR -p $(dirname $THIS_FILE) aoqi@0: #Note that | doesn't work on mac sed. aoqi@0: $CAT $OTHER_DIR/$f | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \ aoqi@0: -e 's/\(\)/\1(removed)\2/' \ aoqi@0: -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)/' \ aoqi@0: -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)/' \ aoqi@0: -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \ aoqi@0: > $OTHER_FILE aoqi@0: $CAT $THIS_DIR/$f | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \ aoqi@0: -e 's/\(\)/\1(removed)\2/' \ aoqi@0: -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)/' \ aoqi@0: -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)/' \ aoqi@0: -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \ aoqi@0: > $THIS_FILE aoqi@0: else aoqi@0: OTHER_FILE=$OTHER_DIR/$f aoqi@0: THIS_FILE=$THIS_DIR/$f aoqi@0: fi aoqi@0: DIFF_OUT=$($DIFF $OTHER_FILE $THIS_FILE 2>&1) aoqi@0: if [ -n "$DIFF_OUT" ]; then aoqi@0: echo $f aoqi@0: REGRESSIONS=true aoqi@0: if [ "$SHOW_DIFFS" = "true" ]; then aoqi@0: echo "$DIFF_OUT" aoqi@0: fi aoqi@0: fi aoqi@0: fi aoqi@0: done aoqi@0: aoqi@0: aoqi@0: } aoqi@0: aoqi@0: ########################################################################################## aoqi@0: # Compare zip file aoqi@0: aoqi@0: compare_zip_file() { aoqi@0: THIS_DIR=$1 aoqi@0: OTHER_DIR=$2 aoqi@0: WORK_DIR=$3 aoqi@0: ZIP_FILE=$4 aoqi@0: # Optionally provide different name for other zipfile aoqi@0: OTHER_ZIP_FILE=$5 aoqi@0: aoqi@0: THIS_ZIP=$THIS_DIR/$ZIP_FILE aoqi@0: if [ -n "$OTHER_ZIP_FILE" ]; then aoqi@0: OTHER_ZIP=$OTHER_DIR/$OTHER_ZIP_FILE aoqi@0: else aoqi@0: OTHER_ZIP=$OTHER_DIR/$ZIP_FILE aoqi@0: fi aoqi@0: aoqi@0: THIS_SUFFIX="${THIS_ZIP##*.}" aoqi@0: OTHER_SUFFIX="${OTHER_ZIP##*.}" aoqi@0: if [ "$THIS_SUFFIX" != "$OTHER_SUFFIX" ]; then aoqi@0: echo The files do not have the same suffix type! aoqi@0: return 2 aoqi@0: fi aoqi@0: aoqi@0: TYPE="$THIS_SUFFIX" aoqi@0: aoqi@0: if $CMP $OTHER_ZIP $THIS_ZIP > /dev/null aoqi@0: then aoqi@0: return 0 aoqi@0: fi aoqi@0: # Not quite identical, the might still contain the same data. aoqi@0: # Unpack the jar/zip files in temp dirs aoqi@0: aoqi@0: THIS_UNZIPDIR=$WORK_DIR/$ZIP_FILE.this aoqi@0: OTHER_UNZIPDIR=$WORK_DIR/$ZIP_FILE.other aoqi@0: $RM -rf $THIS_UNZIPDIR $OTHER_UNZIPDIR aoqi@0: $MKDIR -p $THIS_UNZIPDIR aoqi@0: $MKDIR -p $OTHER_UNZIPDIR aoqi@0: (cd $THIS_UNZIPDIR && $UNARCHIVE $THIS_ZIP) aoqi@0: (cd $OTHER_UNZIPDIR && $UNARCHIVE $OTHER_ZIP) aoqi@0: aoqi@0: # Find all archives inside and unzip them as well to compare the contents rather than aoqi@0: # the archives. pie.jar.pack.gz i app3.war is corrupt, skip it. aoqi@0: EXCEPTIONS="pie.jar.pack.gz" aoqi@0: for pack in $($FIND $THIS_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do aoqi@0: ($UNPACK200 $pack $pack.jar) aoqi@0: # Filter out the unzipped archives from the diff below. aoqi@0: EXCEPTIONS="$EXCEPTIONS $pack $pack.jar" aoqi@0: done aoqi@0: for pack in $($FIND $OTHER_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do aoqi@0: ($UNPACK200 $pack $pack.jar) aoqi@0: EXCEPTIONS="$EXCEPTIONS $pack $pack.jar" aoqi@0: done aoqi@0: for zip in $($FIND $THIS_UNZIPDIR -name "*.jar" -o -name "*.zip"); do aoqi@0: $MKDIR $zip.unzip aoqi@0: (cd $zip.unzip && $UNARCHIVE $zip) aoqi@0: EXCEPTIONS="$EXCEPTIONS $zip" aoqi@0: done aoqi@0: for zip in $($FIND $OTHER_UNZIPDIR -name "*.jar" -o -name "*.zip"); do aoqi@0: $MKDIR $zip.unzip aoqi@0: (cd $zip.unzip && $UNARCHIVE $zip) aoqi@0: EXCEPTIONS="$EXCEPTIONS $zip" aoqi@0: done aoqi@0: aoqi@0: CONTENTS_DIFF_FILE=$WORK_DIR/$ZIP_FILE.diff aoqi@0: # On solaris, there is no -q option. aoqi@0: if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then aoqi@0: LC_ALL=C $DIFF -r $OTHER_UNZIPDIR $THIS_UNZIPDIR \ aoqi@0: | $GREP -v -e "^<" -e "^>" -e "^Common subdirectories:" \ aoqi@0: > $CONTENTS_DIFF_FILE aoqi@0: else aoqi@0: LC_ALL=C $DIFF -rq $OTHER_UNZIPDIR $THIS_UNZIPDIR > $CONTENTS_DIFF_FILE aoqi@0: fi aoqi@0: aoqi@0: ONLY_OTHER=$($GREP "^Only in $OTHER_UNZIPDIR" $CONTENTS_DIFF_FILE) aoqi@0: ONLY_THIS=$($GREP "^Only in $THIS_UNZIPDIR" $CONTENTS_DIFF_FILE) aoqi@0: aoqi@0: return_value=0 aoqi@0: aoqi@0: if [ -n "$ONLY_OTHER" ]; then aoqi@0: echo " Only OTHER $ZIP_FILE contains:" aoqi@0: echo "$ONLY_OTHER" | sed "s|Only in $OTHER_UNZIPDIR| |"g | sed 's|: |/|g' aoqi@0: return_value=1 aoqi@0: fi aoqi@0: aoqi@0: if [ -n "$ONLY_THIS" ]; then aoqi@0: echo " Only THIS $ZIP_FILE contains:" aoqi@0: echo "$ONLY_THIS" | sed "s|Only in $THIS_UNZIPDIR| |"g | sed 's|: |/|g' aoqi@0: return_value=1 aoqi@0: fi aoqi@0: aoqi@0: if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then aoqi@0: DIFFING_FILES=$($GREP -e "differ$" -e "^diff " $CONTENTS_DIFF_FILE \ aoqi@0: | $CUT -f 3 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g") aoqi@0: else aoqi@0: DIFFING_FILES=$($GREP -e "differ$" $CONTENTS_DIFF_FILE \ aoqi@0: | $CUT -f 2 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g") aoqi@0: fi aoqi@0: aoqi@0: $RM -f $WORK_DIR/$ZIP_FILE.diffs aoqi@0: for file in $DIFFING_FILES; do aoqi@0: if [[ "$ACCEPTED_JARZIP_CONTENTS $EXCEPTIONS" != *"$file"* ]]; then aoqi@0: diff_text $OTHER_UNZIPDIR/$file $THIS_UNZIPDIR/$file >> $WORK_DIR/$ZIP_FILE.diffs aoqi@0: fi aoqi@0: done aoqi@0: aoqi@0: if [ -s "$WORK_DIR/$ZIP_FILE.diffs" ]; then aoqi@0: return_value=1 aoqi@0: echo " Differing files in $ZIP_FILE" aoqi@0: $CAT $WORK_DIR/$ZIP_FILE.diffs | $GREP differ | cut -f 2 -d ' ' | \ aoqi@0: $SED "s|$OTHER_UNZIPDIR| |g" > $WORK_DIR/$ZIP_FILE.difflist aoqi@0: $CAT $WORK_DIR/$ZIP_FILE.difflist aoqi@0: aoqi@0: if [ -n "$SHOW_DIFFS" ]; then aoqi@0: for i in $(cat $WORK_DIR/$ZIP_FILE.difflist) ; do aoqi@0: if [ -f "${OTHER_UNZIPDIR}/$i.javap" ]; then aoqi@0: LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap aoqi@0: elif [ -f "${OTHER_UNZIPDIR}/$i.cleaned" ]; then aoqi@0: LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i aoqi@0: else aoqi@0: LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i aoqi@0: fi aoqi@0: done aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: return $return_value aoqi@0: } aoqi@0: aoqi@0: aoqi@0: ########################################################################################## aoqi@0: # Compare all zip files aoqi@0: aoqi@0: compare_all_zip_files() { aoqi@0: THIS_DIR=$1 aoqi@0: OTHER_DIR=$2 aoqi@0: WORK_DIR=$3 aoqi@0: aoqi@0: ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.zip" | $SORT | $FILTER ) aoqi@0: aoqi@0: if [ -n "$ZIPS" ]; then aoqi@0: echo Zip files... aoqi@0: aoqi@0: return_value=0 aoqi@0: for f in $ZIPS; do aoqi@0: if [ -f "$OTHER_DIR/$f" ]; then aoqi@0: compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f aoqi@0: if [ "$?" != "0" ]; then aoqi@0: return_value=1 aoqi@0: REGRESSIONS=true aoqi@0: fi aoqi@0: fi aoqi@0: done aoqi@0: fi aoqi@0: aoqi@0: return $return_value aoqi@0: } aoqi@0: aoqi@0: ########################################################################################## aoqi@0: # Compare all jar files aoqi@0: aoqi@0: compare_all_jar_files() { aoqi@0: THIS_DIR=$1 aoqi@0: OTHER_DIR=$2 aoqi@0: WORK_DIR=$3 aoqi@0: aoqi@0: # TODO filter? aoqi@0: ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.jar" -o -name "*.war" | $SORT | $FILTER) aoqi@0: aoqi@0: if [ -n "$ZIPS" ]; then aoqi@0: echo Jar files... aoqi@0: aoqi@0: return_value=0 aoqi@0: for f in $ZIPS; do aoqi@0: if [ -f "$OTHER_DIR/$f" ]; then aoqi@0: compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f aoqi@0: if [ "$?" != "0" ]; then aoqi@0: return_value=1 aoqi@0: REGRESSIONS=true aoqi@0: fi aoqi@0: fi aoqi@0: done aoqi@0: fi aoqi@0: aoqi@0: return $return_value aoqi@0: } aoqi@0: aoqi@0: ########################################################################################## aoqi@0: # Compare binary (executable/library) file aoqi@0: aoqi@0: compare_bin_file() { aoqi@0: THIS_DIR=$1 aoqi@0: OTHER_DIR=$2 aoqi@0: WORK_DIR=$3 aoqi@0: BIN_FILE=$4 aoqi@0: aoqi@0: THIS_FILE=$THIS_DIR/$BIN_FILE aoqi@0: OTHER_FILE=$OTHER_DIR/$BIN_FILE aoqi@0: NAME=$(basename $BIN_FILE) aoqi@0: WORK_FILE_BASE=$WORK_DIR/$BIN_FILE aoqi@0: FILE_WORK_DIR=$(dirname $WORK_FILE_BASE) aoqi@0: aoqi@0: $MKDIR -p $FILE_WORK_DIR aoqi@0: aoqi@0: ORIG_THIS_FILE="$THIS_FILE" aoqi@0: ORIG_OTHER_FILE="$OTHER_FILE" aoqi@0: aoqi@0: if [[ "$STRIP_BEFORE_COMPARE" = *"$BIN_FILE"* ]]; then aoqi@0: THIS_STRIPPED_FILE=$FILE_WORK_DIR/this/$NAME aoqi@0: OTHER_STRIPPED_FILE=$FILE_WORK_DIR/other/$NAME aoqi@0: $MKDIR -p $FILE_WORK_DIR/this $FILE_WORK_DIR/other aoqi@0: $CP $THIS_FILE $THIS_STRIPPED_FILE aoqi@0: $CP $OTHER_FILE $OTHER_STRIPPED_FILE aoqi@0: $STRIP $THIS_STRIPPED_FILE aoqi@0: $STRIP $OTHER_STRIPPED_FILE aoqi@0: THIS_FILE="$THIS_STRIPPED_FILE" aoqi@0: OTHER_FILE="$OTHER_STRIPPED_FILE" aoqi@0: fi aoqi@0: aoqi@0: if [ "$OPENJDK_TARGET_OS" = "windows" ]; then aoqi@0: unset _NT_SYMBOL_PATH aoqi@0: # On windows we need to unzip the debug symbols, if present aoqi@0: OTHER_FILE_BASE=${OTHER_FILE/.dll/} aoqi@0: OTHER_FILE_BASE=${OTHER_FILE_BASE/.exe/} aoqi@0: DIZ_NAME=$(basename $OTHER_FILE_BASE).diz aoqi@0: # java.exe and java.dll diz files will have the same name. Have to aoqi@0: # make sure java.exe gets the right one. This is only needed for aoqi@0: # OTHER since in the new build, all pdb files are left around. aoqi@0: if [ "$NAME" = "java.exe" ] && [ -f "$OTHER/tmp/java/java/obj64/java.diz" ]; then aoqi@0: OTHER_DIZ_FILE="$OTHER/tmp/java/java/obj64/java.diz" aoqi@0: elif [ -f "${OTHER_FILE_BASE}.diz" ]; then aoqi@0: OTHER_DIZ_FILE=${OTHER_FILE_BASE}.diz aoqi@0: else aoqi@0: # Some files, jli.dll, appears twice in the image but only one of aoqi@0: # thme has a diz file next to it. aoqi@0: OTHER_DIZ_FILE="$($FIND $OTHER_DIR -name $DIZ_NAME | $SED 1q)" aoqi@0: if [ ! -f "$OTHER_DIZ_FILE" ]; then aoqi@0: # As a last resort, look for diz file in the whole build output aoqi@0: # dir. aoqi@0: OTHER_DIZ_FILE="$($FIND $OTHER -name $DIZ_NAME | $SED 1q)" aoqi@0: fi aoqi@0: fi aoqi@0: if [ -n "$OTHER_DIZ_FILE" ]; then aoqi@0: $MKDIR -p $FILE_WORK_DIR/other aoqi@0: (cd $FILE_WORK_DIR/other ; $UNARCHIVE -o $OTHER_DIZ_FILE) aoqi@0: export _NT_SYMBOL_PATH="$FILE_WORK_DIR/other" aoqi@0: fi aoqi@0: THIS_FILE_BASE=${THIS_FILE/.dll/} aoqi@0: THIS_FILE_BASE=${THIS_FILE_BASE/.exe/} aoqi@0: if [ -f "${THIS_FILE/.dll/}.diz" ]; then aoqi@0: THIS_DIZ_FILE=${THIS_FILE/.dll/}.diz aoqi@0: else aoqi@0: THIS_DIZ_FILE="$($FIND $THIS_DIR -name $DIZ_NAME | $SED 1q)" aoqi@0: if [ ! -f "$THIS_DIZ_FILE" ]; then aoqi@0: # As a last resort, look for diz file in the whole build output aoqi@0: # dir. aoqi@0: THIS_DIZ_FILE="$($FIND $THIS -name $DIZ_NAME | $SED 1q)" aoqi@0: fi aoqi@0: fi aoqi@0: if [ -n "$THIS_DIZ_FILE" ]; then aoqi@0: $MKDIR -p $FILE_WORK_DIR/this aoqi@0: (cd $FILE_WORK_DIR/this ; $UNARCHIVE -o $THIS_DIZ_FILE) aoqi@0: export _NT_SYMBOL_PATH="$_NT_SYMBOL_PATH;$FILE_WORK_DIR/this" aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: if [ -z "$SKIP_BIN_DIFF" ]; then aoqi@0: if cmp $OTHER_FILE $THIS_FILE > /dev/null; then aoqi@0: # The files were bytewise identical. aoqi@0: if [ -n "$VERBOSE" ]; then aoqi@0: echo " : : : : : $BIN_FILE" aoqi@0: fi aoqi@0: return 0 aoqi@0: fi aoqi@0: BIN_MSG=" diff " aoqi@0: if [[ "$ACCEPTED_BIN_DIFF" != *"$BIN_FILE"* ]]; then aoqi@0: DIFF_BIN=true aoqi@0: if [[ "$KNOWN_BIN_DIFF" != *"$BIN_FILE"* ]]; then aoqi@0: BIN_MSG="*$BIN_MSG*" aoqi@0: REGRESSIONS=true aoqi@0: else aoqi@0: BIN_MSG=" $BIN_MSG " aoqi@0: fi aoqi@0: else aoqi@0: BIN_MSG="($BIN_MSG)" aoqi@0: DIFF_BIN= aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: if [ -n "$STAT" ]; then aoqi@0: THIS_SIZE=$($STAT $STAT_PRINT_SIZE "$THIS_FILE") aoqi@0: OTHER_SIZE=$($STAT $STAT_PRINT_SIZE "$OTHER_FILE") aoqi@0: else aoqi@0: THIS_SIZE=$(ls -l "$THIS_FILE" | awk '{ print $5 }') aoqi@0: OTHER_SIZE=$(ls -l "$OTHER_FILE" | awk '{ print $5 }') aoqi@0: fi aoqi@0: if [ $THIS_SIZE -ne $OTHER_SIZE ]; then aoqi@0: DIFF_SIZE_NUM=$($EXPR $THIS_SIZE - $OTHER_SIZE) aoqi@0: DIFF_SIZE_REL=$($EXPR $THIS_SIZE \* 100 / $OTHER_SIZE) aoqi@0: SIZE_MSG=$($PRINTF "%3d%% %4d" $DIFF_SIZE_REL $DIFF_SIZE_NUM) aoqi@0: if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_REL" -gt 98 ] \ aoqi@0: && [ "$DIFF_SIZE_REL" -lt 102 ]; then aoqi@0: SIZE_MSG="($SIZE_MSG)" aoqi@0: DIFF_SIZE= aoqi@0: elif [ "$OPENJDK_TARGET_OS" = "windows" ] \ aoqi@0: && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \ aoqi@0: && [ "$DIFF_SIZE_NUM" = 512 ]; then aoqi@0: # On windows, size of binaries increase in 512 increments. aoqi@0: SIZE_MSG="($SIZE_MSG)" aoqi@0: DIFF_SIZE= aoqi@0: elif [ "$OPENJDK_TARGET_OS" = "windows" ] \ aoqi@0: && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \ aoqi@0: && [ "$DIFF_SIZE_NUM" = -512 ]; then aoqi@0: # On windows, size of binaries increase in 512 increments. aoqi@0: SIZE_MSG="($SIZE_MSG)" aoqi@0: DIFF_SIZE= aoqi@0: else aoqi@0: if [[ "$ACCEPTED_SIZE_DIFF" != *"$BIN_FILE"* ]]; then aoqi@0: DIFF_SIZE=true aoqi@0: if [[ "$KNOWN_SIZE_DIFF" != *"$BIN_FILE"* ]]; then aoqi@0: SIZE_MSG="*$SIZE_MSG*" aoqi@0: REGRESSIONS=true aoqi@0: else aoqi@0: SIZE_MSG=" $SIZE_MSG " aoqi@0: fi aoqi@0: else aoqi@0: SIZE_MSG="($SIZE_MSG)" aoqi@0: DIFF_SIZE= aoqi@0: fi aoqi@0: fi aoqi@0: else aoqi@0: SIZE_MSG=" " aoqi@0: DIFF_SIZE= aoqi@0: if [[ "$KNOWN_SIZE_DIFF $ACCEPTED_SIZE_DIFF" = *"$BIN_FILE"* ]]; then aoqi@0: SIZE_MSG=" ! " aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: if [[ "$SORT_SYMBOLS" = *"$BIN_FILE"* ]]; then aoqi@0: SYM_SORT_CMD="sort" aoqi@0: else aoqi@0: SYM_SORT_CMD="cat" aoqi@0: fi aoqi@0: aoqi@0: # Check symbols aoqi@0: if [ "$OPENJDK_TARGET_OS" = "windows" ]; then aoqi@0: # The output from dumpbin on windows differs depending on if the debug symbol aoqi@0: # files are still around at the location the binary is pointing too. Need aoqi@0: # to filter out that extra information. aoqi@0: $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 aoqi@0: $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 aoqi@0: elif [ "$OPENJDK_TARGET_OS" = "solaris" ]; then aoqi@0: # Some symbols get seemingly random 15 character prefixes. Filter them out. aoqi@0: $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 aoqi@0: $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 aoqi@0: else aoqi@0: $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 aoqi@0: $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 aoqi@0: fi aoqi@0: aoqi@0: LC_ALL=C $DIFF $WORK_FILE_BASE.symbols.other $WORK_FILE_BASE.symbols.this > $WORK_FILE_BASE.symbols.diff aoqi@0: if [ -s $WORK_FILE_BASE.symbols.diff ]; then aoqi@0: SYM_MSG=" diff " aoqi@0: if [[ "$ACCEPTED_SYM_DIFF" != *"$BIN_FILE"* ]]; then aoqi@0: DIFF_SYM=true aoqi@0: if [[ "$KNOWN_SYM_DIFF" != *"$BIN_FILE"* ]]; then aoqi@0: SYM_MSG="*$SYM_MSG*" aoqi@0: REGRESSIONS=true aoqi@0: else aoqi@0: SYM_MSG=" $SYM_MSG " aoqi@0: fi aoqi@0: else aoqi@0: SYM_MSG="($SYM_MSG)" aoqi@0: DIFF_SYM= aoqi@0: fi aoqi@0: else aoqi@0: SYM_MSG=" " aoqi@0: DIFF_SYM= aoqi@0: if [[ "$KNOWN_SYM_DIFF $ACCEPTED_SYM_DIFF" = *"$BIN_FILE"* ]]; then aoqi@0: SYM_MSG=" ! " aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: # Check dependencies aoqi@0: if [ -n "$LDD_CMD" ]; then aoqi@0: (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) aoqi@0: (cd $FILE_WORK_DIR && $CP $THIS_FILE . && $LDD_CMD $NAME 2 $WORK_FILE_BASE.deps.this.uniq) aoqi@0: (cd $FILE_WORK_DIR && $RM -f $NAME) aoqi@0: aoqi@0: LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other $WORK_FILE_BASE.deps.this > $WORK_FILE_BASE.deps.diff aoqi@0: LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other.uniq $WORK_FILE_BASE.deps.this.uniq > $WORK_FILE_BASE.deps.diff.uniq aoqi@0: aoqi@0: if [ -s $WORK_FILE_BASE.deps.diff ]; then aoqi@0: if [ -s $WORK_FILE_BASE.deps.diff.uniq ]; then aoqi@0: DEP_MSG=" diff " aoqi@0: else aoqi@0: DEP_MSG=" redun " aoqi@0: fi aoqi@0: if [[ "$ACCEPTED_DEP_DIFF" != *"$BIN_FILE"* ]]; then aoqi@0: DIFF_DEP=true aoqi@0: if [[ "$KNOWN_DEP_DIFF" != *"$BIN_FILE"* ]]; then aoqi@0: DEP_MSG="*$DEP_MSG*" aoqi@0: REGRESSIONS=true aoqi@0: else aoqi@0: DEP_MSG=" $DEP_MSG " aoqi@0: fi aoqi@0: else aoqi@0: DEP_MSG="($DEP_MSG)" aoqi@0: DIFF_DEP= aoqi@0: fi aoqi@0: else aoqi@0: DEP_MSG=" " aoqi@0: DIFF_DEP= aoqi@0: if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then aoqi@0: DEP_MSG=" ! " aoqi@0: fi aoqi@0: fi aoqi@0: else aoqi@0: DEP_MSG=" - " aoqi@0: fi aoqi@0: aoqi@0: # Compare fulldump output aoqi@0: if [ -n "$FULLDUMP_CMD" ] && [ -z "$SKIP_FULLDUMP_DIFF" ]; then aoqi@0: $FULLDUMP_CMD $OTHER_FILE > $WORK_FILE_BASE.fulldump.other 2>&1 aoqi@0: $FULLDUMP_CMD $THIS_FILE > $WORK_FILE_BASE.fulldump.this 2>&1 aoqi@0: LC_ALL=C $DIFF $WORK_FILE_BASE.fulldump.other $WORK_FILE_BASE.fulldump.this > $WORK_FILE_BASE.fulldump.diff aoqi@0: aoqi@0: if [ -s $WORK_FILE_BASE.fulldump.diff ]; then aoqi@0: ELF_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.fulldump.diff | awk '{print $5}') aoqi@0: ELF_MSG=$($PRINTF "%8d" $ELF_DIFF_SIZE) aoqi@0: if [[ "$ACCEPTED_ELF_DIFF" != *"$BIN_FILE"* ]]; then aoqi@0: DIFF_ELF=true aoqi@0: if [[ "$KNOWN_ELF_DIFF" != *"$BIN_FILE"* ]]; then aoqi@0: ELF_MSG="*$ELF_MSG*" aoqi@0: REGRESSIONS=true aoqi@0: else aoqi@0: ELF_MSG=" $ELF_MSG " aoqi@0: fi aoqi@0: else aoqi@0: ELF_MSG="($ELF_MSG)" aoqi@0: DIFF_ELF= aoqi@0: fi aoqi@0: else aoqi@0: ELF_MSG=" " aoqi@0: DIFF_ELF= aoqi@0: if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then aoqi@0: ELF_MSG=" ! " aoqi@0: fi aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: # Compare disassemble output aoqi@0: if [ -n "$DIS_CMD" ] && [ -z "$SKIP_DIS_DIFF" ]; then aoqi@0: if [ -z "$DIS_DIFF_FILTER" ]; then aoqi@0: DIS_DIFF_FILTER="$CAT" aoqi@0: fi aoqi@0: $DIS_CMD $OTHER_FILE | $GREP -v $NAME | $DIS_DIFF_FILTER > $WORK_FILE_BASE.dis.other 2>&1 aoqi@0: $DIS_CMD $THIS_FILE | $GREP -v $NAME | $DIS_DIFF_FILTER > $WORK_FILE_BASE.dis.this 2>&1 aoqi@0: aoqi@0: LC_ALL=C $DIFF $WORK_FILE_BASE.dis.other $WORK_FILE_BASE.dis.this > $WORK_FILE_BASE.dis.diff aoqi@0: aoqi@0: if [ -s $WORK_FILE_BASE.dis.diff ]; then aoqi@0: DIS_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.dis.diff | awk '{print $5}') aoqi@0: DIS_MSG=$($PRINTF "%8d" $DIS_DIFF_SIZE) aoqi@0: if [[ "$ACCEPTED_DIS_DIFF" != *"$BIN_FILE"* ]]; then aoqi@0: DIFF_DIS=true aoqi@0: if [[ "$KNOWN_DIS_DIFF" != *"$BIN_FILE"* ]]; then aoqi@0: DIS_MSG="*$DIS_MSG*" aoqi@0: REGRESSIONS=true aoqi@0: else aoqi@0: DIS_MSG=" $DIS_MSG " aoqi@0: fi aoqi@0: else aoqi@0: DIS_MSG="($DIS_MSG)" aoqi@0: DIFF_DIS= aoqi@0: fi aoqi@0: else aoqi@0: DIS_MSG=" " aoqi@0: DIFF_DIS= aoqi@0: if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then aoqi@0: DIS_MSG=" ! " aoqi@0: fi aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: aoqi@0: if [ -n "$DIFF_BIN$DIFF_SIZE$DIFF_SYM$DIFF_DEP$DIFF_ELF$DIFF_DIS" ] || [ -n "$VERBOSE" ]; then aoqi@0: if [ -n "$BIN_MSG" ]; then echo -n "$BIN_MSG:"; fi aoqi@0: if [ -n "$SIZE_MSG" ]; then echo -n "$SIZE_MSG:"; fi aoqi@0: if [ -n "$SYM_MSG" ]; then echo -n "$SYM_MSG:"; fi aoqi@0: if [ -n "$DEP_MSG" ]; then echo -n "$DEP_MSG:"; fi aoqi@0: if [ -n "$ELF_MSG" ]; then echo -n "$ELF_MSG:"; fi aoqi@0: if [ -n "$DIS_MSG" ]; then echo -n "$DIS_MSG:"; fi aoqi@0: echo " $BIN_FILE" aoqi@0: if [ "$SHOW_DIFFS" = "true" ]; then aoqi@0: if [ -s "$WORK_FILE_BASE.symbols.diff" ]; then aoqi@0: echo "Symbols diff:" aoqi@0: $CAT $WORK_FILE_BASE.symbols.diff aoqi@0: fi aoqi@0: if [ -s "$WORK_FILE_BASE.deps.diff" ]; then aoqi@0: echo "Deps diff:" aoqi@0: $CAT $WORK_FILE_BASE.deps.diff aoqi@0: fi aoqi@0: if [ -s "$WORK_FILE_BASE.fulldump.diff" ]; then aoqi@0: echo "Fulldump diff:" aoqi@0: $CAT $WORK_FILE_BASE.fulldump.diff aoqi@0: fi aoqi@0: if [ -s "$WORK_FILE_BASE.dis.diff" ]; then aoqi@0: echo "Disassembly diff:" aoqi@0: $CAT $WORK_FILE_BASE.dis.diff aoqi@0: fi aoqi@0: fi aoqi@0: return 1 aoqi@0: fi aoqi@0: return 0 aoqi@0: } aoqi@0: aoqi@0: ########################################################################################## aoqi@0: # Print binary diff header aoqi@0: aoqi@0: print_binary_diff_header() { aoqi@0: if [ -z "$SKIP_BIN_DIFF" ]; then echo -n " Binary :"; fi aoqi@0: if [ -z "$SKIP_SIZE_DIFF" ]; then echo -n " Size :"; fi aoqi@0: if [ -z "$SKIP_SYM_DIFF" ]; then echo -n " Symbols :"; fi aoqi@0: if [ -z "$SKIP_DEP_DIFF" ]; then echo -n " Deps :"; fi aoqi@0: if [ -z "$SKIP_FULLDUMP_DIFF" ]; then echo -n " Fulldump :"; fi aoqi@0: if [ -z "$SKIP_DIS_DIFF" ]; then echo -n " Disass :"; fi aoqi@0: echo aoqi@0: } aoqi@0: aoqi@0: ########################################################################################## aoqi@0: # Compare all libraries aoqi@0: aoqi@0: compare_all_libs() { aoqi@0: THIS_DIR=$1 aoqi@0: OTHER_DIR=$2 aoqi@0: WORK_DIR=$3 aoqi@0: aoqi@0: LIBS=$(cd $THIS_DIR && $FIND . -type f \( -name 'lib*.so' -o -name '*.dylib' -o -name '*.dll' -o -name 'JavaControlPanel' \) | $SORT | $FILTER) aoqi@0: aoqi@0: if [ -n "$LIBS" ]; then aoqi@0: echo Libraries... aoqi@0: print_binary_diff_header aoqi@0: for l in $LIBS; do aoqi@0: if [ -f "$OTHER_DIR/$l" ]; then aoqi@0: compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $l aoqi@0: if [ "$?" != "0" ]; then aoqi@0: return_value=1 aoqi@0: fi aoqi@0: fi aoqi@0: done aoqi@0: fi aoqi@0: aoqi@0: return $return_value aoqi@0: } aoqi@0: aoqi@0: ########################################################################################## aoqi@0: # Compare all executables aoqi@0: aoqi@0: compare_all_execs() { aoqi@0: THIS_DIR=$1 aoqi@0: OTHER_DIR=$2 aoqi@0: WORK_DIR=$3 aoqi@0: aoqi@0: if [ "$OPENJDK_TARGET_OS" = "windows" ]; then aoqi@0: EXECS=$(cd $THIS_DIR && $FIND . -type f -name '*.exe' | $SORT | $FILTER) aoqi@0: else aoqi@0: EXECS=$(cd $THIS_DIR && $FIND . -name db -prune -o -type f -perm -100 \! \ aoqi@0: \( -name '*.so' -o -name '*.dylib' -o -name '*.dll' -o -name '*.cgi' \ aoqi@0: -o -name '*.jar' -o -name '*.diz' -o -name 'jcontrol' -o -name '*.properties' \ aoqi@0: -o -name '*.data' -o -name '*.bfc' -o -name '*.src' -o -name '*.txt' \ aoqi@0: -o -name '*.cfg' -o -name 'meta-index' -o -name '*.properties.ja' \ aoqi@0: -o -name 'classlist' \) | $SORT | $FILTER) aoqi@0: fi aoqi@0: aoqi@0: if [ -n "$EXECS" ]; then aoqi@0: echo Executables... aoqi@0: print_binary_diff_header aoqi@0: for e in $EXECS; do aoqi@0: if [ -f "$OTHER_DIR/$e" ]; then aoqi@0: compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $e aoqi@0: if [ "$?" != "0" ]; then aoqi@0: return_value=1 aoqi@0: fi aoqi@0: fi aoqi@0: done aoqi@0: fi aoqi@0: aoqi@0: return $return_value aoqi@0: } aoqi@0: aoqi@0: ########################################################################################## aoqi@0: # Initiate configuration aoqi@0: aoqi@0: COMPARE_ROOT=/tmp/cimages.$USER aoqi@0: $MKDIR -p $COMPARE_ROOT aoqi@0: if [ "$OPENJDK_TARGET_OS" = "windows" ]; then aoqi@0: if [ "$(uname -o)" = "Cygwin" ]; then aoqi@0: COMPARE_ROOT=$(cygpath -msa $COMPARE_ROOT) aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: THIS="$( cd "$( dirname "$0" )" && pwd )" aoqi@0: echo "$THIS" aoqi@0: THIS_SCRIPT="$0" aoqi@0: aoqi@0: if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1" = "/?" ] || [ "$1" = "-help" ] || [ "$1" = "--help" ]; then aoqi@0: echo "bash ./compare.sh [OPTIONS] [FILTER]" aoqi@0: echo "" aoqi@0: echo "-all Compare all files in all known ways" aoqi@0: echo "-names Compare the file names and directory structure" aoqi@0: echo "-perms Compare the permission bits on all files and directories" aoqi@0: echo "-types Compare the output of the file command on all files" aoqi@0: echo "-general Compare the files not convered by the specialized comparisons" aoqi@0: echo "-zips Compare the contents of all zip files" aoqi@0: echo "-jars Compare the contents of all jar files" aoqi@0: echo "-libs Compare all native libraries" aoqi@0: echo "-execs Compare all executables" aoqi@0: echo "-v Verbose output, does not hide known differences" aoqi@0: echo "-vv More verbose output, shows diff output of all comparisons" aoqi@0: echo "-o [OTHER] Compare with build in other directory. Will default to the old build directory" aoqi@0: echo "" aoqi@0: echo "[FILTER] List filenames in the image to compare, works for jars, zips, libs and execs" aoqi@0: echo "Example:" aoqi@0: echo "bash ./common/bin/compareimages.sh CodePointIM.jar" aoqi@0: echo "" aoqi@0: echo "-2zips Compare two zip files only" aoqi@0: echo "" aoqi@0: exit 10 aoqi@0: fi aoqi@0: aoqi@0: CMP_NAMES=false aoqi@0: CMP_PERMS=false aoqi@0: CMP_TYPES=false aoqi@0: CMP_GENERAL=false aoqi@0: CMP_ZIPS=false aoqi@0: CMP_JARS=false aoqi@0: CMP_LIBS=false aoqi@0: CMP_EXECS=false aoqi@0: aoqi@0: while [ -n "$1" ]; do aoqi@0: case "$1" in aoqi@0: -v) aoqi@0: VERBOSE=true aoqi@0: ;; aoqi@0: -vv) aoqi@0: VERBOSE=true aoqi@0: SHOW_DIFFS=true aoqi@0: ;; aoqi@0: -o) aoqi@0: OTHER="$2" aoqi@0: shift aoqi@0: ;; aoqi@0: -all) aoqi@0: CMP_NAMES=true aoqi@0: if [ "$OPENJDK_TARGET_OS" != "windows" ]; then aoqi@0: CMP_PERMS=true aoqi@0: fi aoqi@0: CMP_TYPES=true aoqi@0: CMP_GENERAL=true aoqi@0: CMP_ZIPS=true aoqi@0: CMP_JARS=true aoqi@0: CMP_LIBS=true aoqi@0: CMP_EXECS=true aoqi@0: ;; aoqi@0: -names) aoqi@0: CMP_NAMES=true aoqi@0: ;; aoqi@0: -perms) aoqi@0: CMP_PERMS=true aoqi@0: ;; aoqi@0: -types) aoqi@0: CMP_TYPES=true aoqi@0: ;; aoqi@0: -general) aoqi@0: CMP_GENERAL=true aoqi@0: ;; aoqi@0: -zips) aoqi@0: CMP_ZIPS=true aoqi@0: ;; aoqi@0: -jars) aoqi@0: CMP_JARS=true aoqi@0: ;; aoqi@0: -libs) aoqi@0: CMP_LIBS=true aoqi@0: ;; aoqi@0: -execs) aoqi@0: CMP_EXECS=true aoqi@0: ;; aoqi@0: -2zips) aoqi@0: CMP_2_ZIPS=true aoqi@0: THIS_FILE=$2 aoqi@0: OTHER_FILE=$3 aoqi@0: shift aoqi@0: shift aoqi@0: ;; aoqi@0: *) aoqi@0: CMP_NAMES=false aoqi@0: CMP_PERMS=false aoqi@0: CMP_TYPES=false aoqi@0: CMP_ZIPS=true aoqi@0: CMP_JARS=true aoqi@0: CMP_LIBS=true aoqi@0: CMP_EXECS=true aoqi@0: aoqi@0: if [ -z "$FILTER" ]; then aoqi@0: FILTER="$GREP" aoqi@0: fi aoqi@0: FILTER="$FILTER -e $1" aoqi@0: ;; aoqi@0: esac aoqi@0: shift aoqi@0: done aoqi@0: aoqi@0: if [ "$CMP_2_ZIPS" = "true" ]; then aoqi@0: THIS_DIR="$(dirname $THIS_FILE)" aoqi@0: THIS_DIR="$(cd "$THIS_DIR" && pwd )" aoqi@0: OTHER_DIR="$(dirname $OTHER_FILE)" aoqi@0: OTHER_DIR="$(cd "$OTHER_DIR" && pwd )" aoqi@0: THIS_FILE_NAME="$(basename $THIS_FILE)" aoqi@0: OTHER_FILE_NAME="$(basename $OTHER_FILE)" aoqi@0: echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME aoqi@0: compare_zip_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2zips $THIS_FILE_NAME $OTHER_FILE_NAME aoqi@0: exit aoqi@0: fi aoqi@0: aoqi@0: 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 aoqi@0: CMP_NAMES=true aoqi@0: CMP_PERMS=true aoqi@0: CMP_TYPES=true aoqi@0: CMP_GENERAL=true aoqi@0: CMP_ZIPS=true aoqi@0: CMP_JARS=true aoqi@0: CMP_LIBS=true aoqi@0: CMP_EXECS=true aoqi@0: fi aoqi@0: aoqi@0: if [ -z "$FILTER" ]; then aoqi@0: FILTER="$CAT" aoqi@0: fi aoqi@0: aoqi@0: if [ -z "$OTHER" ]; then aoqi@0: OTHER="$THIS/../$LEGACY_BUILD_DIR" aoqi@0: if [ -d "$OTHER" ]; then aoqi@0: OTHER="$( cd "$OTHER" && pwd )" aoqi@0: else aoqi@0: echo "Default old build directory does not exist:" aoqi@0: echo "$OTHER" aoqi@0: exit 1 aoqi@0: fi aoqi@0: echo "Comparing to default old build:" aoqi@0: echo "$OTHER" aoqi@0: echo aoqi@0: else aoqi@0: if [ ! -d "$OTHER" ]; then aoqi@0: echo "Other build directory does not exist:" aoqi@0: echo "$OTHER" aoqi@0: exit 1 aoqi@0: fi aoqi@0: OTHER="$( cd "$OTHER" && pwd )" aoqi@0: echo "Comparing to:" aoqi@0: echo "$OTHER" aoqi@0: echo aoqi@0: fi aoqi@0: aoqi@0: aoqi@0: # Figure out the layout of the this build. Which kinds of images have been produced aoqi@0: if [ -d "$THIS/install/j2sdk-image" ]; then aoqi@0: THIS_J2SDK="$THIS/install/j2sdk-image" aoqi@0: THIS_J2RE="$THIS/install/j2re-image" aoqi@0: echo "Selecting install images in this build" aoqi@0: elif [ -d "$THIS/deploy/j2sdk-image" ]; then aoqi@0: THIS_J2SDK="$THIS/deploy/j2sdk-image" aoqi@0: THIS_J2RE="$THIS/deploy/j2re-image" aoqi@0: echo "Selecting deploy images in this build" aoqi@0: elif [ -d "$THIS/images/j2sdk-image" ]; then aoqi@0: THIS_J2SDK="$THIS/images/j2sdk-image" aoqi@0: THIS_J2RE="$THIS/images/j2re-image" aoqi@0: echo "Selecting jdk images in this build" aoqi@0: fi aoqi@0: aoqi@0: if [ -d "$THIS/images/j2sdk-overlay-image" ]; then aoqi@0: if [ -d "$THIS/install/j2sdk-image" ]; then aoqi@0: # If there is an install image, prefer that, it's also overlay aoqi@0: THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image" aoqi@0: THIS_J2RE_OVERLAY="$THIS/install/j2re-image" aoqi@0: echo "Selecting install overlay images in this build" aoqi@0: else aoqi@0: THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image" aoqi@0: THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image" aoqi@0: echo "Selecting jdk overlay images in this build" aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: if [ -d "$THIS/images/j2sdk-bundle" ]; then aoqi@0: THIS_J2SDK_BUNDLE="$THIS/images/j2sdk-bundle" aoqi@0: THIS_J2RE_BUNDLE="$THIS/images/j2re-bundle" aoqi@0: echo "Selecting bundles in this build" aoqi@0: fi aoqi@0: aoqi@0: # Figure out the layout of the other build (old or new, normal or overlay image) aoqi@0: if [ -d "$OTHER/j2sdk-image" ]; then aoqi@0: if [ -f "$OTHER/j2sdk-image/LICENSE" ]; then aoqi@0: OTHER_J2SDK="$OTHER/j2sdk-image" aoqi@0: OTHER_J2RE="$OTHER/j2re-image" aoqi@0: echo "Selecting old-style images in other build" aoqi@0: else aoqi@0: OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image" aoqi@0: OTHER_J2RE_OVERLAY="$OTHER/j2re-image" aoqi@0: echo "Selecting overlay images in other build" aoqi@0: fi aoqi@0: elif [ -d "$OTHER/install/j2sdk-image" ]; then aoqi@0: OTHER_J2SDK="$OTHER/install/j2sdk-image" aoqi@0: OTHER_J2RE="$OTHER/install/j2re-image" aoqi@0: echo "Selecting install images in other build" aoqi@0: elif [ -d "$OTHER/deploy/j2sdk-image" ]; then aoqi@0: OTHER_J2SDK="$OTHER/deploy/j2sdk-image" aoqi@0: OTHER_J2RE="$OTHER/deploy/j2re-image" aoqi@0: echo "Selecting deploy images in other build" aoqi@0: elif [ -d "$OTHER/images/j2sdk-image" ]; then aoqi@0: OTHER_J2SDK="$OTHER/images/j2sdk-image" aoqi@0: OTHER_J2RE="$OTHER/images/j2re-image" aoqi@0: echo "Selecting jdk images in other build" aoqi@0: fi aoqi@0: aoqi@0: if [ -d "$OTHER/j2sdk-bundle" ]; then aoqi@0: OTHER_J2SDK_BUNDLE="$OTHER/j2sdk-bundle" aoqi@0: OTHER_J2RE_BUNDLE="$OTHER/j2re-bundle" aoqi@0: echo "Selecting bundles in other build" aoqi@0: elif [ -d "$OTHER/images/j2sdk-bundle" ]; then aoqi@0: OTHER_J2SDK_BUNDLE="$OTHER/images/j2sdk-bundle" aoqi@0: OTHER_J2RE_BUNDLE="$OTHER/images/j2re-bundle" aoqi@0: echo "Selecting jdk bundles in other build" aoqi@0: fi aoqi@0: aoqi@0: if [ -z "$THIS_J2SDK" ] || [ -z "$THIS_J2RE" ]; then aoqi@0: if [ -z "$THIS_J2SDK_OVERLAY" ]; then aoqi@0: echo "Cannot locate images for this build. Are you sure you have run 'make images'?" aoqi@0: exit 1 aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: if [ -z "$OTHER_J2SDK" ] && [ -n "$OTHER_J2SDK_OVERLAY" ] && [ -z "$THIS_J2SDK_OVERLAY" ]; then aoqi@0: echo "OTHER build only has an overlay image while this build does not. Nothing to compare!" aoqi@0: exit 1 aoqi@0: fi aoqi@0: aoqi@0: if [ -z "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then aoqi@0: echo "WARNING! OTHER build has bundles built while this build does not." aoqi@0: echo "Skipping bundle compare!" aoqi@0: fi aoqi@0: aoqi@0: if [ -d "$THIS/docs" ]; then aoqi@0: THIS_DOCS="$THIS/docs" aoqi@0: fi aoqi@0: aoqi@0: if [ -d "$OTHER/docs" ]; then aoqi@0: OTHER_DOCS="$OTHER/docs" aoqi@0: fi aoqi@0: aoqi@0: if [ -z "$THIS_DOCS" ]; then aoqi@0: echo "WARNING! Docs haven't been built and won't be compared." aoqi@0: fi aoqi@0: aoqi@0: if [ -z "$OTHER_DOCS" ]; then aoqi@0: echo "WARNING! Other build doesn't contain docs, skipping doc compare." aoqi@0: fi aoqi@0: aoqi@0: if [ -d "$OTHER/images" ]; then aoqi@0: OTHER_SEC_DIR="$OTHER/images" aoqi@0: else aoqi@0: OTHER_SEC_DIR="$OTHER/tmp" aoqi@0: fi aoqi@0: OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip" aoqi@0: THIS_SEC_DIR="$THIS/images" aoqi@0: THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip" aoqi@0: if [ "$OPENJDK_TARGET_OS" = "windows" ]; then aoqi@0: if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then aoqi@0: JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip" aoqi@0: else aoqi@0: JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip" aoqi@0: fi aoqi@0: OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip" aoqi@0: OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN" aoqi@0: THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip" aoqi@0: THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN" aoqi@0: fi aoqi@0: aoqi@0: ########################################################################################## aoqi@0: # Do the work aoqi@0: aoqi@0: if [ "$CMP_NAMES" = "true" ]; then aoqi@0: if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then aoqi@0: echo -n "J2SDK " aoqi@0: compare_dirs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk aoqi@0: echo -n "J2RE " aoqi@0: compare_dirs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re aoqi@0: aoqi@0: echo -n "J2SDK " aoqi@0: compare_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk aoqi@0: echo -n "J2RE " aoqi@0: compare_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re aoqi@0: fi aoqi@0: if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then aoqi@0: echo -n "J2SDK Overlay " aoqi@0: compare_dirs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay aoqi@0: echo -n "J2RE Overlay " aoqi@0: compare_dirs $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay aoqi@0: aoqi@0: echo -n "J2SDK Overlay " aoqi@0: compare_files $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay aoqi@0: echo -n "J2RE Overlay " aoqi@0: compare_files $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay aoqi@0: fi aoqi@0: if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then aoqi@0: echo -n "J2SDK Bundle " aoqi@0: compare_dirs $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle aoqi@0: echo -n "J2RE Bundle " aoqi@0: compare_dirs $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle aoqi@0: aoqi@0: echo -n "J2SDK Bundle " aoqi@0: compare_files $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle aoqi@0: echo -n "J2RE Bundle " aoqi@0: compare_files $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle aoqi@0: fi aoqi@0: if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then aoqi@0: echo -n "Docs " aoqi@0: compare_dirs $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs aoqi@0: echo -n "Docs " aoqi@0: compare_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: if [ "$CMP_PERMS" = "true" ]; then aoqi@0: if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then aoqi@0: echo -n "J2SDK " aoqi@0: compare_permissions $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk aoqi@0: echo -n "J2RE " aoqi@0: compare_permissions $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re aoqi@0: fi aoqi@0: if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then aoqi@0: echo -n "J2SDK Overlay " aoqi@0: compare_permissions $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay aoqi@0: echo -n "J2RE Overlay " aoqi@0: compare_permissions $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay aoqi@0: fi aoqi@0: if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then aoqi@0: echo -n "J2SDK Bundle " aoqi@0: compare_permissions $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle aoqi@0: echo -n "J2RE Bundle " aoqi@0: compare_permissions $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: if [ "$CMP_TYPES" = "true" ]; then aoqi@0: if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then aoqi@0: echo -n "J2SDK " aoqi@0: compare_file_types $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk aoqi@0: echo -n "J2RE " aoqi@0: compare_file_types $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re aoqi@0: fi aoqi@0: if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then aoqi@0: echo -n "J2SDK Overlay " aoqi@0: compare_file_types $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay aoqi@0: echo -n "J2RE Overlay " aoqi@0: compare_file_types $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay aoqi@0: fi aoqi@0: if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then aoqi@0: echo -n "J2SDK Bundle " aoqi@0: compare_file_types $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle aoqi@0: echo -n "J2RE Bundle " aoqi@0: compare_file_types $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: if [ "$CMP_GENERAL" = "true" ]; then aoqi@0: if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then aoqi@0: echo -n "J2SDK " aoqi@0: compare_general_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk aoqi@0: echo -n "J2RE " aoqi@0: compare_general_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re aoqi@0: fi aoqi@0: if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then aoqi@0: echo -n "J2SDK Overlay " aoqi@0: compare_general_files $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay aoqi@0: echo -n "J2RE Overlay " aoqi@0: compare_general_files $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay aoqi@0: fi aoqi@0: if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then aoqi@0: echo -n "J2SDK Bundle " aoqi@0: compare_general_files $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle aoqi@0: echo -n "J2RE Bundle " aoqi@0: compare_general_files $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle aoqi@0: fi aoqi@0: if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then aoqi@0: echo -n "Docs " aoqi@0: compare_general_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: if [ "$CMP_ZIPS" = "true" ]; then aoqi@0: if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then aoqi@0: compare_all_zip_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk aoqi@0: fi aoqi@0: if [ -n "$THIS_SEC_BIN" ] && [ -n "$OTHER_SEC_BIN" ]; then aoqi@0: if [ -n "$(echo $THIS_SEC_BIN | $FILTER)" ]; then aoqi@0: echo "sec-bin.zip..." aoqi@0: compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-bin.zip aoqi@0: fi aoqi@0: fi aoqi@0: if [ -n "$THIS_SEC_WINDOWS_BIN" ] && [ -n "$OTHER_SEC_WINDOWS_BIN" ]; then aoqi@0: if [ -n "$(echo $THIS_SEC_WINDOWS_BIN | $FILTER)" ]; then aoqi@0: echo "sec-windows-bin.zip..." aoqi@0: compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-windows-bin.zip aoqi@0: fi aoqi@0: fi aoqi@0: if [ -n "$THIS_JGSS_WINDOWS_BIN" ] && [ -n "$OTHER_JGSS_WINDOWS_BIN" ]; then aoqi@0: if [ -n "$(echo $THIS_JGSS_WINDOWS_BIN | $FILTER)" ]; then aoqi@0: echo "$JGSS_WINDOWS_BIN..." aoqi@0: compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin $JGSS_WINDOWS_BIN aoqi@0: fi aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: if [ "$CMP_JARS" = "true" ]; then aoqi@0: if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then aoqi@0: compare_all_jar_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: if [ "$CMP_LIBS" = "true" ]; then aoqi@0: if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then aoqi@0: echo -n "J2SDK " aoqi@0: compare_all_libs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk aoqi@0: if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then aoqi@0: echo -n "J2RE " aoqi@0: compare_all_libs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re aoqi@0: fi aoqi@0: fi aoqi@0: if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then aoqi@0: echo -n "Bundle " aoqi@0: compare_all_libs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: if [ "$CMP_EXECS" = "true" ]; then aoqi@0: if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then aoqi@0: compare_all_execs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk aoqi@0: fi aoqi@0: if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then aoqi@0: echo -n "Overlay " aoqi@0: compare_all_execs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay aoqi@0: fi aoqi@0: fi aoqi@0: aoqi@0: echo aoqi@0: aoqi@0: if [ -n "$REGRESSIONS" ]; then aoqi@0: echo "REGRESSIONS FOUND!" aoqi@0: echo aoqi@0: exit 1 aoqi@0: else aoqi@0: echo "No regressions found" aoqi@0: echo aoqi@0: exit 0 aoqi@0: fi