equal
deleted
inserted
replaced
818 fi |
818 fi |
819 else |
819 else |
820 BIN_MSG="($BIN_MSG)" |
820 BIN_MSG="($BIN_MSG)" |
821 DIFF_BIN= |
821 DIFF_BIN= |
822 fi |
822 fi |
|
823 else |
|
824 BIN_MSG= |
|
825 DIFF_BIN= |
823 fi |
826 fi |
824 |
827 |
825 if [ -n "$STAT" ]; then |
828 if [ -n "$STAT" ]; then |
826 THIS_SIZE=$($STAT $STAT_PRINT_SIZE "$THIS_FILE") |
829 THIS_SIZE=$($STAT $STAT_PRINT_SIZE "$THIS_FILE") |
827 OTHER_SIZE=$($STAT $STAT_PRINT_SIZE "$OTHER_FILE") |
830 OTHER_SIZE=$($STAT $STAT_PRINT_SIZE "$OTHER_FILE") |
1569 echo -n "JDK " |
1572 echo -n "JDK " |
1570 compare_all_libs $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk |
1573 compare_all_libs $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk |
1571 fi |
1574 fi |
1572 if [ -n "$THIS_TEST" ] && [ -n "$OTHER_TEST" ]; then |
1575 if [ -n "$THIS_TEST" ] && [ -n "$OTHER_TEST" ]; then |
1573 echo -n "Test " |
1576 echo -n "Test " |
1574 # Test native libs are never stripped so will not compare well. |
1577 STRIP_ALL_bak="$STRIP_ALL" |
1575 SKIP_BIN_DIFF="true" |
1578 if [ "$STRIP_TESTS_BEFORE_COMPARE" = "true" ]; then |
1576 ACCEPTED_SMALL_SIZE_DIFF_bak="$ACCEPTED_SMALL_SIZE_DIFF" |
1579 STRIP_ALL="true" |
1577 if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then |
|
1578 ACCEPTED_SMALL_SIZE_DIFF="true" |
|
1579 fi |
1580 fi |
1580 compare_all_libs $THIS_TEST $OTHER_TEST $COMPARE_ROOT/test |
1581 compare_all_libs $THIS_TEST $OTHER_TEST $COMPARE_ROOT/test |
1581 SKIP_BIN_DIFF="false" |
1582 STRIP_ALL="$STRIP_ALL_bak" |
1582 ACCEPTED_SMALL_SIZE_DIFF="$ACCEPTED_SMALL_SIZE_DIFF_bak" |
|
1583 fi |
1583 fi |
1584 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then |
1584 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then |
1585 compare_all_libs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir |
1585 compare_all_libs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir |
1586 fi |
1586 fi |
1587 fi |
1587 fi |
1591 echo -n "JDK " |
1591 echo -n "JDK " |
1592 compare_all_execs $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk |
1592 compare_all_execs $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk |
1593 fi |
1593 fi |
1594 if [ -n "$THIS_TEST" ] && [ -n "$OTHER_TEST" ]; then |
1594 if [ -n "$THIS_TEST" ] && [ -n "$OTHER_TEST" ]; then |
1595 echo -n "Test " |
1595 echo -n "Test " |
1596 # Test native executables are never stripped so will not compare well. |
1596 STRIP_ALL_bak="$STRIP_ALL" |
1597 SKIP_BIN_DIFF="true" |
1597 if [ "$STRIP_TESTS_BEFORE_COMPARE" = "true" ]; then |
|
1598 STRIP_ALL="true" |
|
1599 fi |
1598 compare_all_execs $THIS_TEST $OTHER_TEST $COMPARE_ROOT/test |
1600 compare_all_execs $THIS_TEST $OTHER_TEST $COMPARE_ROOT/test |
1599 SKIP_BIN_DIFF="false" |
1601 STRIP_ALL="$STRIP_ALL_bak" |
1600 fi |
1602 fi |
1601 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then |
1603 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then |
1602 compare_all_execs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir |
1604 compare_all_execs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir |
1603 fi |
1605 fi |
1604 fi |
1606 fi |