changeset 85:b5ed41bbffb4

macosx: refresh preview patch from latest review of 7113349
author jrose
date Thu, 01 Mar 2012 01:08:21 -0800
parents be72adae7866
children f4da9aff1281
files macosx-7113349.patch
diffstat 1 files changed, 48 insertions(+), 59 deletions(-) [+]
line wrap: on
line diff
--- a/macosx-7113349.patch	Thu Mar 01 00:18:30 2012 -0800
+++ b/macosx-7113349.patch	Thu Mar 01 01:08:21 2012 -0800
@@ -1,12 +1,12 @@
---- old/.hgignore	2012-02-27 17:38:23.000000000 +0000
-+++ new/.hgignore	2012-02-27 17:38:23.000000000 +0000
+--- old/.hgignore	2012-02-29 22:11:38.000000000 +0000
++++ new/.hgignore	2012-02-29 22:11:38.000000000 +0000
 @@ -2,3 +2,4 @@
  ^dist/
  /nbproject/private/
  ^.hgtip
 +.DS_Store
---- old/make/jprt.properties	2012-02-27 17:38:24.000000000 +0000
-+++ new/make/jprt.properties	2012-02-27 17:38:24.000000000 +0000
+--- old/make/jprt.properties	2012-02-29 22:11:38.000000000 +0000
++++ new/make/jprt.properties	2012-02-29 22:11:38.000000000 +0000
 @@ -39,6 +39,7 @@
      solaris_x64_5.10-{product|fastdebug},                       \
      linux_i586_2.6-{product|fastdebug},                         \
@@ -42,8 +42,8 @@
 +# Default test targets
 +jprt.make.rule.test.targets=					\
 +    ${jprt.my.test.target.set:TESTNAME=jtreg}
---- old/test/Makefile	2012-02-27 17:38:24.000000000 +0000
-+++ new/test/Makefile	2012-02-27 17:38:24.000000000 +0000
+--- old/test/Makefile	2012-02-29 22:11:39.000000000 +0000
++++ new/test/Makefile	2012-02-29 22:11:39.000000000 +0000
 @@ -36,6 +36,14 @@
      ARCH=i586
    endif
@@ -67,8 +67,8 @@
  jtreg-tests: check-jtreg FRC
  	@rm -f -r $(JTREG_OUTPUT_DIR)/JTwork $(JTREG_OUTPUT_DIR)/JTreport \
  	    $(JTREG_OUTPUT_DIR)/diff.html $(JTREG_OUTPUT_DIR)/status.txt
---- old/test/tools/javac/4846262/Test.sh	2012-02-27 17:38:25.000000000 +0000
-+++ new/test/tools/javac/4846262/Test.sh	2012-02-27 17:38:25.000000000 +0000
+--- old/test/tools/javac/4846262/Test.sh	2012-02-29 22:11:39.000000000 +0000
++++ new/test/tools/javac/4846262/Test.sh	2012-02-29 22:11:39.000000000 +0000
 @@ -44,7 +44,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -78,8 +78,8 @@
      FS="/"
      ;;
    CYGWIN* )
---- old/test/tools/javac/6302184/T6302184.sh	2012-02-27 17:38:25.000000000 +0000
-+++ new/test/tools/javac/6302184/T6302184.sh	2012-02-27 17:38:25.000000000 +0000
+--- old/test/tools/javac/6302184/T6302184.sh	2012-02-29 22:11:40.000000000 +0000
++++ new/test/tools/javac/6302184/T6302184.sh	2012-02-29 22:11:40.000000000 +0000
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -89,8 +89,8 @@
      FS="/"
      ;;
    CYGWIN* )
---- old/test/tools/javac/ClassPathTest/ClassPathTest.sh	2012-02-27 17:38:26.000000000 +0000
-+++ new/test/tools/javac/ClassPathTest/ClassPathTest.sh	2012-02-27 17:38:26.000000000 +0000
+--- old/test/tools/javac/ClassPathTest/ClassPathTest.sh	2012-02-29 22:11:40.000000000 +0000
++++ new/test/tools/javac/ClassPathTest/ClassPathTest.sh	2012-02-29 22:11:40.000000000 +0000
 @@ -56,7 +56,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -100,8 +100,8 @@
      FS="/"
      ;;
    Windows* )
---- old/test/tools/javac/ExtDirs/ExtDirs.sh	2012-02-27 17:38:26.000000000 +0000
-+++ new/test/tools/javac/ExtDirs/ExtDirs.sh	2012-02-27 17:38:26.000000000 +0000
+--- old/test/tools/javac/ExtDirs/ExtDirs.sh	2012-02-29 22:11:41.000000000 +0000
++++ new/test/tools/javac/ExtDirs/ExtDirs.sh	2012-02-29 22:11:40.000000000 +0000
 @@ -54,7 +54,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -111,8 +111,8 @@
      PS=":"
      FS="/"
      ;;
---- old/test/tools/javac/MissingInclude.sh	2012-02-27 17:38:27.000000000 +0000
-+++ new/test/tools/javac/MissingInclude.sh	2012-02-27 17:38:27.000000000 +0000
+--- old/test/tools/javac/MissingInclude.sh	2012-02-29 22:11:41.000000000 +0000
++++ new/test/tools/javac/MissingInclude.sh	2012-02-29 22:11:41.000000000 +0000
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -122,8 +122,8 @@
      FS="/"
      ;;
    Windows* )
---- old/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	2012-02-27 17:38:27.000000000 +0000
-+++ new/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	2012-02-27 17:38:27.000000000 +0000
+--- old/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	2012-02-29 22:11:42.000000000 +0000
++++ new/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	2012-02-29 22:11:42.000000000 +0000
 @@ -52,7 +52,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -133,8 +133,8 @@
      PS=":"
      FS="/"
      ;;
---- old/test/tools/javac/T5090006/compiler.sh	2012-02-27 17:38:28.000000000 +0000
-+++ new/test/tools/javac/T5090006/compiler.sh	2012-02-27 17:38:28.000000000 +0000
+--- old/test/tools/javac/T5090006/compiler.sh	2012-02-29 22:11:43.000000000 +0000
++++ new/test/tools/javac/T5090006/compiler.sh	2012-02-29 22:11:42.000000000 +0000
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -144,19 +144,8 @@
      FS="/"
      ;;
    Windows* )
---- old/test/tools/javac/apt.sh	2012-02-27 17:38:29.000000000 +0000
-+++ new/test/tools/javac/apt.sh	2012-02-27 17:38:28.000000000 +0000
-@@ -38,7 +38,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux )
-+  SunOS | Linux | Darwin )
-     NULL=/dev/null
-     PS=":"
-     FS="/"
---- old/test/tools/javac/constDebug/ConstDebug.sh	2012-02-27 17:38:29.000000000 +0000
-+++ new/test/tools/javac/constDebug/ConstDebug.sh	2012-02-27 17:38:29.000000000 +0000
+--- old/test/tools/javac/constDebug/ConstDebug.sh	2012-02-29 22:11:43.000000000 +0000
++++ new/test/tools/javac/constDebug/ConstDebug.sh	2012-02-29 22:11:43.000000000 +0000
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -166,8 +155,8 @@
      PS=":"
      FS="/"
      ;;
---- old/test/tools/javac/fatalErrors/NoJavaLang.sh	2012-02-27 17:38:30.000000000 +0000
-+++ new/test/tools/javac/fatalErrors/NoJavaLang.sh	2012-02-27 17:38:29.000000000 +0000
+--- old/test/tools/javac/fatalErrors/NoJavaLang.sh	2012-02-29 22:11:44.000000000 +0000
++++ new/test/tools/javac/fatalErrors/NoJavaLang.sh	2012-02-29 22:11:43.000000000 +0000
 @@ -48,7 +48,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -177,8 +166,8 @@
      FS="/"
      ;;
    CYGWIN* )
---- old/test/tools/javac/innerClassFile/Driver.sh	2012-02-27 17:38:30.000000000 +0000
-+++ new/test/tools/javac/innerClassFile/Driver.sh	2012-02-27 17:38:30.000000000 +0000
+--- old/test/tools/javac/innerClassFile/Driver.sh	2012-02-29 22:11:44.000000000 +0000
++++ new/test/tools/javac/innerClassFile/Driver.sh	2012-02-29 22:11:44.000000000 +0000
 @@ -53,7 +53,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -188,8 +177,8 @@
      FS="/"
      ;;
    Windows* )
---- old/test/tools/javac/javazip/Test.sh	2012-02-27 17:38:31.000000000 +0000
-+++ new/test/tools/javac/javazip/Test.sh	2012-02-27 17:38:31.000000000 +0000
+--- old/test/tools/javac/javazip/Test.sh	2012-02-29 22:11:45.000000000 +0000
++++ new/test/tools/javac/javazip/Test.sh	2012-02-29 22:11:44.000000000 +0000
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -199,8 +188,8 @@
      FS="/"
      SCR=`pwd`
      ;;
---- old/test/tools/javac/links/links.sh	2012-02-27 17:38:31.000000000 +0000
-+++ new/test/tools/javac/links/links.sh	2012-02-27 17:38:31.000000000 +0000
+--- old/test/tools/javac/links/links.sh	2012-02-29 22:11:45.000000000 +0000
++++ new/test/tools/javac/links/links.sh	2012-02-29 22:11:45.000000000 +0000
 @@ -53,7 +53,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -210,8 +199,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- old/test/tools/javac/newlines/Newlines.sh	2012-02-27 17:38:32.000000000 +0000
-+++ new/test/tools/javac/newlines/Newlines.sh	2012-02-27 17:38:32.000000000 +0000
+--- old/test/tools/javac/newlines/Newlines.sh	2012-02-29 22:11:45.000000000 +0000
++++ new/test/tools/javac/newlines/Newlines.sh	2012-02-29 22:11:45.000000000 +0000
 @@ -50,7 +50,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -221,8 +210,8 @@
      FS="/"
      ;;
    Windows* )
---- old/test/tools/javac/stackmap/T4955930.sh	2012-02-27 17:38:32.000000000 +0000
-+++ new/test/tools/javac/stackmap/T4955930.sh	2012-02-27 17:38:32.000000000 +0000
+--- old/test/tools/javac/stackmap/T4955930.sh	2012-02-29 22:11:46.000000000 +0000
++++ new/test/tools/javac/stackmap/T4955930.sh	2012-02-29 22:11:46.000000000 +0000
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -232,8 +221,8 @@
      FS="/"
      ;;
    Windows_95 | Windows_98 | Windows_NT )
---- old/test/tools/javac/unicode/SupplementaryJavaID6.sh	2012-02-27 17:38:33.000000000 +0000
-+++ new/test/tools/javac/unicode/SupplementaryJavaID6.sh	2012-02-27 17:38:33.000000000 +0000
+--- old/test/tools/javac/unicode/SupplementaryJavaID6.sh	2012-02-29 22:11:46.000000000 +0000
++++ new/test/tools/javac/unicode/SupplementaryJavaID6.sh	2012-02-29 22:11:46.000000000 +0000
 @@ -55,7 +55,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -243,8 +232,8 @@
      if [ -d /usr/lib/locale/en_US.UTF-8 -o -d /usr/lib/locale/en_US.utf8 ]
      then
          ENV="env LANG=en_US.UTF-8"
---- old/test/tools/javah/6257087/foo.sh	2012-02-27 17:38:33.000000000 +0000
-+++ new/test/tools/javah/6257087/foo.sh	2012-02-27 17:38:33.000000000 +0000
+--- old/test/tools/javah/6257087/foo.sh	2012-02-29 22:11:47.000000000 +0000
++++ new/test/tools/javah/6257087/foo.sh	2012-02-29 22:11:47.000000000 +0000
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -254,8 +243,8 @@
      PS=":"
      FS="/"
      ;;
---- old/test/tools/javah/ConstMacroTest.sh	2012-02-27 17:38:34.000000000 +0000
-+++ new/test/tools/javah/ConstMacroTest.sh	2012-02-27 17:38:34.000000000 +0000
+--- old/test/tools/javah/ConstMacroTest.sh	2012-02-29 22:11:47.000000000 +0000
++++ new/test/tools/javah/ConstMacroTest.sh	2012-02-29 22:11:47.000000000 +0000
 @@ -56,7 +56,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -265,8 +254,8 @@
      PS=":"
      FS="/"
      ;;
---- old/test/tools/javah/MissingParamClassTest.sh	2012-02-27 17:38:34.000000000 +0000
-+++ new/test/tools/javah/MissingParamClassTest.sh	2012-02-27 17:38:34.000000000 +0000
+--- old/test/tools/javah/MissingParamClassTest.sh	2012-02-29 22:11:48.000000000 +0000
++++ new/test/tools/javah/MissingParamClassTest.sh	2012-02-29 22:11:48.000000000 +0000
 @@ -58,7 +58,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -276,8 +265,8 @@
      PS=":"
      FS="/"
      ;;
---- old/test/tools/javah/ReadOldClass.sh	2012-02-27 17:38:35.000000000 +0000
-+++ new/test/tools/javah/ReadOldClass.sh	2012-02-27 17:38:35.000000000 +0000
+--- old/test/tools/javah/ReadOldClass.sh	2012-02-29 22:11:48.000000000 +0000
++++ new/test/tools/javah/ReadOldClass.sh	2012-02-29 22:11:48.000000000 +0000
 @@ -43,7 +43,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -287,8 +276,8 @@
      PS=":"
      FS="/"
      ;;
---- old/test/tools/javap/pathsep.sh	2012-02-27 17:38:35.000000000 +0000
-+++ new/test/tools/javap/pathsep.sh	2012-02-27 17:38:35.000000000 +0000
+--- old/test/tools/javap/pathsep.sh	2012-02-29 22:11:49.000000000 +0000
++++ new/test/tools/javap/pathsep.sh	2012-02-29 22:11:49.000000000 +0000
 @@ -40,7 +40,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -298,8 +287,8 @@
      FS="/"
      ;;
    Windows* )
---- old/test/jprt.config	2012-02-27 17:38:36.000000000 +0000
-+++ /dev/null	2012-02-27 17:38:36.000000000 +0000
+--- old/test/jprt.config	2012-02-29 22:11:50.000000000 +0000
++++ /dev/null	2012-02-29 22:11:50.000000000 +0000
 @@ -1,159 +0,0 @@
 -#!echo "This is not a shell script"
 -#############################################################################