Mercurial > jdk8-mips64-public > langtools / changeset
changeset
7113349: Initial changeset for Macosx port to jdk
Tue, 06 Mar 2012 20:27:12 +0000
- author
- michaelm
- date
- Tue, 06 Mar 2012 20:27:12 +0000
- changeset 1223
- f3743b82945e
- parent 1222
- eaae5cf911be
- child 1224
- 7245999a0075
7113349: Initial changeset for Macosx port to jdk
Reviewed-by: jjh, alanb, dholmes, anthony, ohrstrom, ksrini, jrose, weijun, smarks
Contributed-by: Alan Bateman <alan.bateman@oracle.com>, Alexander Potochkin <alexander.potochkin@oracle.com>, Alexander Zuev <alexander.zuev@oracle.com>, Andrew Brygin <andrew.brygin@oracle.com>, Artem Ananiev <artem.ananiev@oracle.com>, Alex Strange <astrange@apple.com>, Bino George <bino@apple.com>, Christine Lu <christine.lu@oracle.com>, David Katleman <david.katleman@oracle.com>, David Durrence <david_durrence@apple.com>, Dmitry Cherepanov <dmitry.cherepanov@oracle.com>, Greg Lewis <glewis@eyesbeyond.com>, Kevin Miller <kevin_m_miller@apple.com>, Kurt Miller <kurt@intricatesoftware.com>, Landon Fuller <landonf@plausiblelabs.com>, Leonid Romanov <leonid.romanov@oracle.com>, Loefty Walkowiak <loefty@apple.com>, Mark Reinhold <mark.reinhold@oracle.com>, Naoto Sato <naoto.sato@oracle.com>, Philip Race <philip.race@oracle.com>, Roger Hoover <rhoover@apple.com>, Scott Kovatch <scott.kovatch@oracle.com>, Sergey ByloKhov <sergey.bylokhov@oracle.com>, Mike Swingler <swingler@apple.com>, Tomas Hurka <tomas.hurka@oracle.com>
1.1 --- a/.hgignore Tue Mar 06 16:50:32 2012 +0000 1.2 +++ b/.hgignore Tue Mar 06 20:27:12 2012 +0000 1.3 @@ -2,3 +2,4 @@ 1.4 ^dist/ 1.5 /nbproject/private/ 1.6 ^.hgtip 1.7 +.DS_Store
2.1 --- a/make/jprt.properties Tue Mar 06 16:50:32 2012 +0000 2.2 +++ b/make/jprt.properties Tue Mar 06 20:27:12 2012 +0000 2.3 @@ -39,6 +39,7 @@ 2.4 solaris_x64_5.10-{product|fastdebug}, \ 2.5 linux_i586_2.6-{product|fastdebug}, \ 2.6 linux_x64_2.6-{product|fastdebug}, \ 2.7 + macosx_x64_10.7-{product|fastdebug}, \ 2.8 windows_i586_5.1-{product|fastdebug}, \ 2.9 windows_x64_5.2-{product|fastdebug} 2.10 2.11 @@ -50,6 +51,7 @@ 2.12 solaris_x64_5.10-product-c2-TESTNAME, \ 2.13 linux_i586_2.6-product-{c1|c2}-TESTNAME, \ 2.14 linux_x64_2.6-product-c2-TESTNAME, \ 2.15 + macosx_x64_10.7-product-c2-TESTNAME, \ 2.16 windows_i586_5.1-product-c1-TESTNAME, \ 2.17 windows_x64_5.2-product-c2-TESTNAME 2.18 2.19 @@ -60,3 +62,18 @@ 2.20 # Directories to be excluded from the source bundles 2.21 jprt.bundle.exclude.src.dirs=build dist webrev 2.22 2.23 +# Test target list (no fastdebug & limited c2 testing) 2.24 +jprt.my.test.target.set= \ 2.25 + solaris_sparc_5.10-product-c1-TESTNAME, \ 2.26 + solaris_sparcv9_5.10-product-c2-TESTNAME, \ 2.27 + solaris_i586_5.10-product-c1-TESTNAME, \ 2.28 + solaris_x64_5.10-product-c2-TESTNAME, \ 2.29 + linux_i586_2.6-product-{c1|c2}-TESTNAME, \ 2.30 + linux_x64_2.6-product-c2-TESTNAME, \ 2.31 + macosx_x64_10.7-product-c2-TESTNAME, \ 2.32 + windows_i586_5.1-product-c1-TESTNAME, \ 2.33 + windows_x64_5.2-product-c2-TESTNAME 2.34 + 2.35 +# Default test targets 2.36 +jprt.make.rule.test.targets= \ 2.37 + ${jprt.my.test.target.set:TESTNAME=jtreg}
3.1 --- a/test/Makefile Tue Mar 06 16:50:32 2012 +0000 3.2 +++ b/test/Makefile Tue Mar 06 20:27:12 2012 +0000 3.3 @@ -36,6 +36,14 @@ 3.4 ARCH=i586 3.5 endif 3.6 endif 3.7 +ifeq ($(OSNAME), Darwin) 3.8 + PLATFORM = bsd 3.9 + JT_PLATFORM = linux 3.10 + ARCH = $(shell uname -m) 3.11 + ifeq ($(ARCH), i386) 3.12 + ARCH=i586 3.13 + endif 3.14 +endif 3.15 ifeq ($(OSNAME), Windows_NT) 3.16 # MKS 3.17 PLATFORM=windows 3.18 @@ -251,6 +259,7 @@ 3.19 # JTREG_REFERENCE 3.20 # (Optional) reference results (e.g. work, report or summary.txt) 3.21 # 3.22 +jtreg_tests: jtreg-tests 3.23 jtreg-tests: check-jtreg FRC 3.24 @rm -f -r $(JTREG_OUTPUT_DIR)/JTwork $(JTREG_OUTPUT_DIR)/JTreport \ 3.25 $(JTREG_OUTPUT_DIR)/diff.html $(JTREG_OUTPUT_DIR)/status.txt
4.1 --- a/test/jprt.config Tue Mar 06 16:50:32 2012 +0000 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,159 +0,0 @@ 4.4 -#!echo "This is not a shell script" 4.5 -############################################################################# 4.6 -# Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. 4.7 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4.8 -# 4.9 -# This code is free software; you can redistribute it and/or modify it 4.10 -# under the terms of the GNU General Public License version 2 only, as 4.11 -# published by the Free Software Foundation. 4.12 -# 4.13 -# This code is distributed in the hope that it will be useful, but WITHOUT 4.14 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 4.15 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 4.16 -# version 2 for more details (a copy is included in the LICENSE file that 4.17 -# accompanied this code). 4.18 -# 4.19 -# You should have received a copy of the GNU General Public License version 4.20 -# 2 along with this work; if not, write to the Free Software Foundation, 4.21 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 4.22 -# 4.23 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 4.24 -# or visit www.oracle.com if you need additional information or have any 4.25 -# questions. 4.26 -############################################################################# 4.27 -# 4.28 -# JPRT shell configuration for testing. 4.29 -# 4.30 -# Input environment variables: 4.31 -# Windows Only: 4.32 -# PATH 4.33 -# ROOTDIR 4.34 -# 4.35 -# Output variable settings: 4.36 -# make Full path to GNU make 4.37 -# 4.38 -# Output environment variables: 4.39 -# PATH 4.40 -# 4.41 -############################################################################# 4.42 - 4.43 -############################################################################# 4.44 -# Error 4.45 -error() # message 4.46 -{ 4.47 - echo "ERROR: $1" 4.48 - exit 6 4.49 -} 4.50 -# Directory must exist 4.51 -dirMustExist() # dir name 4.52 -{ 4.53 - if [ ! -d "$1" ] ; then 4.54 - error "Directory for $2 does not exist: $1" 4.55 - fi 4.56 -} 4.57 -# File must exist 4.58 -fileMustExist() # dir name 4.59 -{ 4.60 - if [ ! -f "$1" ] ; then 4.61 - error "File for $2 does not exist: $1" 4.62 - fi 4.63 -} 4.64 -############################################################################# 4.65 - 4.66 -# Should be set by JPRT as the 3 basic inputs 4.67 -slashjava="${ALT_SLASH_JAVA}" 4.68 -if [ "${slashjava}" = "" ] ; then 4.69 - slashjava=/java 4.70 -fi 4.71 - 4.72 -# Check input 4.73 -dirMustExist "${slashjava}" ALT_SLASH_JAVA 4.74 - 4.75 -# Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise. 4.76 -osname=`uname -s` 4.77 -if [ "${osname}" = SunOS ] ; then 4.78 - 4.79 - # SOLARIS: Sparc or X86 4.80 - osarch=`uname -p` 4.81 - if [ "${osarch}" = sparc ] ; then 4.82 - solaris_arch=sparc 4.83 - else 4.84 - solaris_arch=i386 4.85 - fi 4.86 - 4.87 - # Add basic solaris system paths 4.88 - path4sdk=/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin 4.89 - 4.90 - # Find GNU make 4.91 - make=/usr/sfw/bin/gmake 4.92 - if [ ! -f ${make} ] ; then 4.93 - make=/opt/sfw/bin/gmake 4.94 - if [ ! -f ${make} ] ; then 4.95 - make=${slashjava}/devtools/${solaris_arch}/bin/gnumake 4.96 - fi 4.97 - fi 4.98 - fileMustExist "${make}" make 4.99 - 4.100 - # File creation mask 4.101 - umask 002 4.102 - 4.103 -elif [ "${osname}" = Linux ] ; then 4.104 - 4.105 - # Add basic paths 4.106 - path4sdk=/usr/bin:/bin:/usr/sbin:/sbin 4.107 - 4.108 - # Find GNU make 4.109 - make=/usr/bin/make 4.110 - fileMustExist "${make}" make 4.111 - 4.112 - umask 002 4.113 - 4.114 -else 4.115 - 4.116 - # Windows: Differs on CYGWIN vs. MKS. 4.117 - 4.118 - # We need to determine if we are running a CYGWIN shell or an MKS shell 4.119 - # (if uname isn't available, then it will be unix_toolset=unknown) 4.120 - unix_toolset=unknown 4.121 - if [ "`uname -a | fgrep Cygwin`" = "" -a -d "${ROOTDIR}" ] ; then 4.122 - # We kind of assume ROOTDIR is where MKS is and it's ok 4.123 - unix_toolset=MKS 4.124 - mkshome=`dosname -s "${ROOTDIR}"` 4.125 - # Most unix utilities are in the mksnt directory of ROOTDIR 4.126 - unixcommand_path="${mkshome}/mksnt" 4.127 - path4sdk="${unixcommand_path}" 4.128 - devtools_path="${slashjava}/devtools/win32/bin" 4.129 - path4sdk="${devtools_path};${path4sdk}" 4.130 - # Find GNU make 4.131 - make="${devtools_path}/gnumake.exe" 4.132 - fileMustExist "${make}" make 4.133 - elif [ "`uname -a | fgrep Cygwin`" != "" -a -f /bin/cygpath ] ; then 4.134 - # For CYGWIN, uname will have "Cygwin" in it, and /bin/cygpath should exist 4.135 - unix_toolset=CYGWIN 4.136 - # Most unix utilities are in the /usr/bin 4.137 - unixcommand_path="/usr/bin" 4.138 - path4sdk="${unixcommand_path}" 4.139 - # Find GNU make 4.140 - make="${unixcommand_path}/make.exe" 4.141 - fileMustExist "${make}" make 4.142 - else 4.143 - echo "WARNING: Cannot figure out if this is MKS or CYGWIN" 4.144 - fi 4.145 - 4.146 - 4.147 - # For windows, it's hard to know where the system is, so we just add this 4.148 - # to PATH. 4.149 - slash_path="`echo ${path4sdk} | sed -e 's@\\\\@/@g' -e 's@//@/@g' -e 's@/$@@' -e 's@/;@;@g'`" 4.150 - path4sdk="${slash_path};${PATH}" 4.151 - 4.152 - # Convert path4sdk to cygwin style 4.153 - if [ "${unix_toolset}" = CYGWIN ] ; then 4.154 - path4sdk="`/usr/bin/cygpath -p ${path4sdk}`" 4.155 - fi 4.156 - 4.157 -fi 4.158 - 4.159 -# Export PATH setting 4.160 -PATH="${path4sdk}" 4.161 -export PATH 4.162 -
5.1 --- a/test/tools/javac/4846262/Test.sh Tue Mar 06 16:50:32 2012 +0000 5.2 +++ b/test/tools/javac/4846262/Test.sh Tue Mar 06 20:27:12 2012 +0000 5.3 @@ -44,7 +44,7 @@ 5.4 # set platform-dependent variables 5.5 OS=`uname -s` 5.6 case "$OS" in 5.7 - SunOS | Linux ) 5.8 + SunOS | Linux | Darwin ) 5.9 FS="/" 5.10 ;; 5.11 CYGWIN* )
6.1 --- a/test/tools/javac/6302184/T6302184.sh Tue Mar 06 16:50:32 2012 +0000 6.2 +++ b/test/tools/javac/6302184/T6302184.sh Tue Mar 06 20:27:12 2012 +0000 6.3 @@ -41,7 +41,7 @@ 6.4 # set platform-dependent variables 6.5 OS=`uname -s` 6.6 case "$OS" in 6.7 - SunOS | Linux ) 6.8 + SunOS | Linux | Darwin ) 6.9 FS="/" 6.10 ;; 6.11 CYGWIN* )
7.1 --- a/test/tools/javac/ClassPathTest/ClassPathTest.sh Tue Mar 06 16:50:32 2012 +0000 7.2 +++ b/test/tools/javac/ClassPathTest/ClassPathTest.sh Tue Mar 06 20:27:12 2012 +0000 7.3 @@ -56,7 +56,7 @@ 7.4 # set platform-dependent variables 7.5 OS=`uname -s` 7.6 case "$OS" in 7.7 - SunOS | Linux | CYGWIN* ) 7.8 + SunOS | Linux | Darwin | CYGWIN* ) 7.9 FS="/" 7.10 ;; 7.11 Windows* )
8.1 --- a/test/tools/javac/ExtDirs/ExtDirs.sh Tue Mar 06 16:50:32 2012 +0000 8.2 +++ b/test/tools/javac/ExtDirs/ExtDirs.sh Tue Mar 06 20:27:12 2012 +0000 8.3 @@ -54,7 +54,7 @@ 8.4 # set platform-dependent variables 8.5 OS=`uname -s` 8.6 case "$OS" in 8.7 - SunOS | Linux ) 8.8 + SunOS | Linux | Darwin ) 8.9 PS=":" 8.10 FS="/" 8.11 ;;
9.1 --- a/test/tools/javac/MissingInclude.sh Tue Mar 06 16:50:32 2012 +0000 9.2 +++ b/test/tools/javac/MissingInclude.sh Tue Mar 06 20:27:12 2012 +0000 9.3 @@ -47,7 +47,7 @@ 9.4 # set platform-dependent variables 9.5 OS=`uname -s` 9.6 case "$OS" in 9.7 - SunOS | Linux | CYGWIN* ) 9.8 + SunOS | Linux | Darwin | CYGWIN* ) 9.9 FS="/" 9.10 ;; 9.11 Windows* )
10.1 --- a/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh Tue Mar 06 16:50:32 2012 +0000 10.2 +++ b/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh Tue Mar 06 20:27:12 2012 +0000 10.3 @@ -52,7 +52,7 @@ 10.4 # set platform-dependent variables 10.5 OS=`uname -s` 10.6 case "$OS" in 10.7 - SunOS | Linux ) 10.8 + SunOS | Linux | Darwin ) 10.9 PS=":" 10.10 FS="/" 10.11 ;;
11.1 --- a/test/tools/javac/T5090006/compiler.sh Tue Mar 06 16:50:32 2012 +0000 11.2 +++ b/test/tools/javac/T5090006/compiler.sh Tue Mar 06 20:27:12 2012 +0000 11.3 @@ -47,7 +47,7 @@ 11.4 # set platform-dependent variables 11.5 OS=`uname -s` 11.6 case "$OS" in 11.7 - SunOS | Linux | CYGWIN* ) 11.8 + SunOS | Linux | Darwin | CYGWIN* ) 11.9 FS="/" 11.10 ;; 11.11 Windows* )
12.1 --- a/test/tools/javac/constDebug/ConstDebug.sh Tue Mar 06 16:50:32 2012 +0000 12.2 +++ b/test/tools/javac/constDebug/ConstDebug.sh Tue Mar 06 20:27:12 2012 +0000 12.3 @@ -47,7 +47,7 @@ 12.4 # set platform-dependent variables 12.5 OS=`uname -s` 12.6 case "$OS" in 12.7 - SunOS | Linux ) 12.8 + SunOS | Linux | Darwin ) 12.9 PS=":" 12.10 FS="/" 12.11 ;;
13.1 --- a/test/tools/javac/fatalErrors/NoJavaLang.sh Tue Mar 06 16:50:32 2012 +0000 13.2 +++ b/test/tools/javac/fatalErrors/NoJavaLang.sh Tue Mar 06 20:27:12 2012 +0000 13.3 @@ -48,7 +48,7 @@ 13.4 # set platform-dependent variables 13.5 OS=`uname -s` 13.6 case "$OS" in 13.7 - SunOS | Linux ) 13.8 + SunOS | Linux | Darwin ) 13.9 FS="/" 13.10 ;; 13.11 CYGWIN* )
14.1 --- a/test/tools/javac/innerClassFile/Driver.sh Tue Mar 06 16:50:32 2012 +0000 14.2 +++ b/test/tools/javac/innerClassFile/Driver.sh Tue Mar 06 20:27:12 2012 +0000 14.3 @@ -53,7 +53,7 @@ 14.4 # set platform-dependent variables 14.5 OS=`uname -s` 14.6 case "$OS" in 14.7 - SunOS | Linux | CYGWIN* ) 14.8 + SunOS | Linux | Darwin | CYGWIN* ) 14.9 FS="/" 14.10 ;; 14.11 Windows* )
15.1 --- a/test/tools/javac/javazip/Test.sh Tue Mar 06 16:50:32 2012 +0000 15.2 +++ b/test/tools/javac/javazip/Test.sh Tue Mar 06 20:27:12 2012 +0000 15.3 @@ -41,7 +41,7 @@ 15.4 # set platform-dependent variables 15.5 OS=`uname -s` 15.6 case "$OS" in 15.7 - SunOS | Linux ) 15.8 + SunOS | Linux | Darwin ) 15.9 FS="/" 15.10 SCR=`pwd` 15.11 ;;
16.1 --- a/test/tools/javac/links/links.sh Tue Mar 06 16:50:32 2012 +0000 16.2 +++ b/test/tools/javac/links/links.sh Tue Mar 06 20:27:12 2012 +0000 16.3 @@ -53,7 +53,7 @@ 16.4 # set platform-dependent variables 16.5 OS=`uname -s` 16.6 case "$OS" in 16.7 - SunOS | Linux ) 16.8 + SunOS | Linux | Darwin ) 16.9 NULL=/dev/null 16.10 PS=":" 16.11 FS="/"
17.1 --- a/test/tools/javac/newlines/Newlines.sh Tue Mar 06 16:50:32 2012 +0000 17.2 +++ b/test/tools/javac/newlines/Newlines.sh Tue Mar 06 20:27:12 2012 +0000 17.3 @@ -50,7 +50,7 @@ 17.4 # set platform-dependent variables 17.5 OS=`uname -s` 17.6 case "$OS" in 17.7 - SunOS | Linux | CYGWIN* ) 17.8 + SunOS | Linux | Darwin | CYGWIN* ) 17.9 FS="/" 17.10 ;; 17.11 Windows* )
18.1 --- a/test/tools/javac/stackmap/T4955930.sh Tue Mar 06 16:50:32 2012 +0000 18.2 +++ b/test/tools/javac/stackmap/T4955930.sh Tue Mar 06 20:27:12 2012 +0000 18.3 @@ -41,7 +41,7 @@ 18.4 # set platform-dependent variables 18.5 OS=`uname -s` 18.6 case "$OS" in 18.7 - SunOS | Linux | CYGWIN* ) 18.8 + SunOS | Linux | Darwin | CYGWIN* ) 18.9 FS="/" 18.10 ;; 18.11 Windows_95 | Windows_98 | Windows_NT )
19.1 --- a/test/tools/javac/unicode/SupplementaryJavaID6.sh Tue Mar 06 16:50:32 2012 +0000 19.2 +++ b/test/tools/javac/unicode/SupplementaryJavaID6.sh Tue Mar 06 20:27:12 2012 +0000 19.3 @@ -55,7 +55,7 @@ 19.4 # set platform-dependent variables 19.5 OS=`uname -s` 19.6 case "$OS" in 19.7 - SunOS | Linux ) 19.8 + SunOS | Linux | Darwin ) 19.9 if [ -d /usr/lib/locale/en_US.UTF-8 -o -d /usr/lib/locale/en_US.utf8 ] 19.10 then 19.11 ENV="env LANG=en_US.UTF-8"
20.1 --- a/test/tools/javah/6257087/foo.sh Tue Mar 06 16:50:32 2012 +0000 20.2 +++ b/test/tools/javah/6257087/foo.sh Tue Mar 06 20:27:12 2012 +0000 20.3 @@ -41,7 +41,7 @@ 20.4 # set platform-dependent variables 20.5 OS=`uname -s` 20.6 case "$OS" in 20.7 - SunOS | Linux ) 20.8 + SunOS | Linux | Darwin ) 20.9 PS=":" 20.10 FS="/" 20.11 ;;
21.1 --- a/test/tools/javah/ConstMacroTest.sh Tue Mar 06 16:50:32 2012 +0000 21.2 +++ b/test/tools/javah/ConstMacroTest.sh Tue Mar 06 20:27:12 2012 +0000 21.3 @@ -56,7 +56,7 @@ 21.4 # set platform-dependent variables 21.5 OS=`uname -s` 21.6 case "$OS" in 21.7 - SunOS | Linux ) 21.8 + SunOS | Linux | Darwin ) 21.9 PS=":" 21.10 FS="/" 21.11 ;;
22.1 --- a/test/tools/javah/MissingParamClassTest.sh Tue Mar 06 16:50:32 2012 +0000 22.2 +++ b/test/tools/javah/MissingParamClassTest.sh Tue Mar 06 20:27:12 2012 +0000 22.3 @@ -58,7 +58,7 @@ 22.4 # set platform-dependent variables 22.5 OS=`uname -s` 22.6 case "$OS" in 22.7 - SunOS | Linux | CYGWIN* ) 22.8 + SunOS | Linux | Darwin | CYGWIN* ) 22.9 PS=":" 22.10 FS="/" 22.11 ;;
23.1 --- a/test/tools/javah/ReadOldClass.sh Tue Mar 06 16:50:32 2012 +0000 23.2 +++ b/test/tools/javah/ReadOldClass.sh Tue Mar 06 20:27:12 2012 +0000 23.3 @@ -43,7 +43,7 @@ 23.4 # set platform-dependent variables 23.5 OS=`uname -s` 23.6 case "$OS" in 23.7 - SunOS | Linux | CYGWIN* ) 23.8 + SunOS | Linux | Darwin | CYGWIN* ) 23.9 PS=":" 23.10 FS="/" 23.11 ;;
24.1 --- a/test/tools/javap/pathsep.sh Tue Mar 06 16:50:32 2012 +0000 24.2 +++ b/test/tools/javap/pathsep.sh Tue Mar 06 20:27:12 2012 +0000 24.3 @@ -40,7 +40,7 @@ 24.4 # set platform-dependent variables 24.5 OS=`uname -s` 24.6 case "$OS" in 24.7 - SunOS | Linux | CYGWIN* ) 24.8 + SunOS | Linux | Darwin | CYGWIN* ) 24.9 FS="/" 24.10 ;; 24.11 Windows* )
