Mercurial > hg > release > icedtea7-forest-2.2 > langtools
changeset 1185:d8e7e2ccbd41
7130704: Few of the jtreg tests need to be ported for mac builds
Reviewed-by: ohair
line wrap: on
line diff
--- a/make/jprt.properties Tue Jan 24 08:56:19 2012 +0000 +++ b/make/jprt.properties Tue Jan 24 10:24:42 2012 -0800 @@ -46,3 +46,18 @@ # Directories to be excluded from the source bundles jprt.bundle.exclude.src.dirs=build dist webrev +# Test target list (no fastdebug & limited c2 testing) +jprt.my.test.target.set= \ + solaris_sparc_5.10-product-c1-TESTNAME, \ + solaris_sparcv9_5.10-product-c2-TESTNAME, \ + solaris_i586_5.10-product-c1-TESTNAME, \ + solaris_x64_5.10-product-c2-TESTNAME, \ + linux_i586_2.6-product-{c1|c2}-TESTNAME, \ + linux_x64_2.6-product-c2-TESTNAME, \ + macosx_x64_10.7-product-c2-TESTNAME, \ + windows_i586_5.1-product-c1-TESTNAME, \ + windows_x64_5.2-product-c2-TESTNAME + +# Default test targets +jprt.make.rule.test.targets= \ + ${jprt.my.test.target.set:TESTNAME=jtreg}
--- a/test/Makefile Tue Jan 24 08:56:19 2012 +0000 +++ b/test/Makefile Tue Jan 24 10:24:42 2012 -0800 @@ -34,6 +34,14 @@ ARCH=i586 endif endif +ifeq ($(OSNAME), Darwin) + PLATFORM = bsd + JT_PLATFORM = linux + ARCH = $(shell uname -m) + ifeq ($(ARCH), i386) + ARCH=i586 + endif +endif ifeq ($(OSNAME), Windows_NT) PLATFORM = windows JT_PLATFORM = win32 @@ -240,6 +248,7 @@ # JTREG_REFERENCE # (Optional) reference results (e.g. work, report or summary.txt) # +jtreg_tests: jtreg-tests 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
--- a/test/jprt.config Tue Jan 24 08:56:19 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,159 +0,0 @@ -#!echo "This is not a shell script" -############################################################################# -# Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -############################################################################# -# -# JPRT shell configuration for testing. -# -# Input environment variables: -# Windows Only: -# PATH -# ROOTDIR -# -# Output variable settings: -# make Full path to GNU make -# -# Output environment variables: -# PATH -# -############################################################################# - -############################################################################# -# Error -error() # message -{ - echo "ERROR: $1" - exit 6 -} -# Directory must exist -dirMustExist() # dir name -{ - if [ ! -d "$1" ] ; then - error "Directory for $2 does not exist: $1" - fi -} -# File must exist -fileMustExist() # dir name -{ - if [ ! -f "$1" ] ; then - error "File for $2 does not exist: $1" - fi -} -############################################################################# - -# Should be set by JPRT as the 3 basic inputs -slashjava="${ALT_SLASH_JAVA}" -if [ "${slashjava}" = "" ] ; then - slashjava=/java -fi - -# Check input -dirMustExist "${slashjava}" ALT_SLASH_JAVA - -# Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise. -osname=`uname -s` -if [ "${osname}" = SunOS ] ; then - - # SOLARIS: Sparc or X86 - osarch=`uname -p` - if [ "${osarch}" = sparc ] ; then - solaris_arch=sparc - else - solaris_arch=i386 - fi - - # Add basic solaris system paths - path4sdk=/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin - - # Find GNU make - make=/usr/sfw/bin/gmake - if [ ! -f ${make} ] ; then - make=/opt/sfw/bin/gmake - if [ ! -f ${make} ] ; then - make=${slashjava}/devtools/${solaris_arch}/bin/gnumake - fi - fi - fileMustExist "${make}" make - - # File creation mask - umask 002 - -elif [ "${osname}" = Linux ] ; then - - # Add basic paths - path4sdk=/usr/bin:/bin:/usr/sbin:/sbin - - # Find GNU make - make=/usr/bin/make - fileMustExist "${make}" make - - umask 002 - -else - - # Windows: Differs on CYGWIN vs. MKS. - - # We need to determine if we are running a CYGWIN shell or an MKS shell - # (if uname isn't available, then it will be unix_toolset=unknown) - unix_toolset=unknown - if [ "`uname -a | fgrep Cygwin`" = "" -a -d "${ROOTDIR}" ] ; then - # We kind of assume ROOTDIR is where MKS is and it's ok - unix_toolset=MKS - mkshome=`dosname -s "${ROOTDIR}"` - # Most unix utilities are in the mksnt directory of ROOTDIR - unixcommand_path="${mkshome}/mksnt" - path4sdk="${unixcommand_path}" - devtools_path="${slashjava}/devtools/win32/bin" - path4sdk="${devtools_path};${path4sdk}" - # Find GNU make - make="${devtools_path}/gnumake.exe" - fileMustExist "${make}" make - elif [ "`uname -a | fgrep Cygwin`" != "" -a -f /bin/cygpath ] ; then - # For CYGWIN, uname will have "Cygwin" in it, and /bin/cygpath should exist - unix_toolset=CYGWIN - # Most unix utilities are in the /usr/bin - unixcommand_path="/usr/bin" - path4sdk="${unixcommand_path}" - # Find GNU make - make="${unixcommand_path}/make.exe" - fileMustExist "${make}" make - else - echo "WARNING: Cannot figure out if this is MKS or CYGWIN" - fi - - - # For windows, it's hard to know where the system is, so we just add this - # to PATH. - slash_path="`echo ${path4sdk} | sed -e 's@\\\\@/@g' -e 's@//@/@g' -e 's@/$@@' -e 's@/;@;@g'`" - path4sdk="${slash_path};${PATH}" - - # Convert path4sdk to cygwin style - if [ "${unix_toolset}" = CYGWIN ] ; then - path4sdk="`/usr/bin/cygpath -p ${path4sdk}`" - fi - -fi - -# Export PATH setting -PATH="${path4sdk}" -export PATH -
--- a/test/tools/javac/4846262/Test.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javac/4846262/Test.sh Tue Jan 24 10:24:42 2012 -0800 @@ -44,7 +44,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux ) + SunOS | Linux | Darwin ) FS="/" ;; CYGWIN* )
--- a/test/tools/javac/6302184/T6302184.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javac/6302184/T6302184.sh Tue Jan 24 10:24:42 2012 -0800 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux ) + SunOS | Linux | Darwin ) FS="/" ;; CYGWIN* )
--- a/test/tools/javac/ClassPathTest/ClassPathTest.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javac/ClassPathTest/ClassPathTest.sh Tue Jan 24 10:24:42 2012 -0800 @@ -56,7 +56,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux | CYGWIN* ) + SunOS | Linux | Darwin | CYGWIN* ) FS="/" ;; Windows* )
--- a/test/tools/javac/ExtDirs/ExtDirs.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javac/ExtDirs/ExtDirs.sh Tue Jan 24 10:24:42 2012 -0800 @@ -54,7 +54,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux ) + SunOS | Linux | Darwin ) PS=":" FS="/" ;;
--- a/test/tools/javac/MissingInclude.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javac/MissingInclude.sh Tue Jan 24 10:24:42 2012 -0800 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux | CYGWIN* ) + SunOS | Linux | Darwin | CYGWIN* ) FS="/" ;; Windows* )
--- a/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh Tue Jan 24 10:24:42 2012 -0800 @@ -52,7 +52,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux ) + SunOS | Linux | Darwin ) PS=":" FS="/" ;;
--- a/test/tools/javac/T5090006/compiler.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javac/T5090006/compiler.sh Tue Jan 24 10:24:42 2012 -0800 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux | CYGWIN* ) + SunOS | Linux | Darwin | CYGWIN* ) FS="/" ;; Windows* )
--- a/test/tools/javac/apt.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javac/apt.sh Tue Jan 24 10:24:42 2012 -0800 @@ -38,7 +38,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux ) + SunOS | Linux | Darwin ) NULL=/dev/null PS=":" FS="/"
--- a/test/tools/javac/constDebug/ConstDebug.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javac/constDebug/ConstDebug.sh Tue Jan 24 10:24:42 2012 -0800 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux ) + SunOS | Linux | Darwin ) PS=":" FS="/" ;;
--- a/test/tools/javac/fatalErrors/NoJavaLang.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javac/fatalErrors/NoJavaLang.sh Tue Jan 24 10:24:42 2012 -0800 @@ -48,7 +48,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux ) + SunOS | Linux | Darwin ) FS="/" ;; CYGWIN* )
--- a/test/tools/javac/innerClassFile/Driver.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javac/innerClassFile/Driver.sh Tue Jan 24 10:24:42 2012 -0800 @@ -53,7 +53,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux | CYGWIN* ) + SunOS | Linux | Darwin | CYGWIN* ) FS="/" ;; Windows* )
--- a/test/tools/javac/javazip/Test.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javac/javazip/Test.sh Tue Jan 24 10:24:42 2012 -0800 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux ) + SunOS | Linux | Darwin ) FS="/" SCR=`pwd` ;;
--- a/test/tools/javac/links/links.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javac/links/links.sh Tue Jan 24 10:24:42 2012 -0800 @@ -53,7 +53,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux ) + SunOS | Linux | Darwin ) NULL=/dev/null PS=":" FS="/"
--- a/test/tools/javac/newlines/Newlines.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javac/newlines/Newlines.sh Tue Jan 24 10:24:42 2012 -0800 @@ -50,7 +50,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux | CYGWIN* ) + SunOS | Linux | Darwin | CYGWIN* ) FS="/" ;; Windows* )
--- a/test/tools/javac/stackmap/T4955930.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javac/stackmap/T4955930.sh Tue Jan 24 10:24:42 2012 -0800 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux | CYGWIN* ) + SunOS | Linux | Darwin | CYGWIN* ) FS="/" ;; Windows_95 | Windows_98 | Windows_NT )
--- a/test/tools/javac/unicode/SupplementaryJavaID6.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javac/unicode/SupplementaryJavaID6.sh Tue Jan 24 10:24:42 2012 -0800 @@ -55,7 +55,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux ) + SunOS | Linux | Darwin ) 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"
--- a/test/tools/javah/6257087/foo.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javah/6257087/foo.sh Tue Jan 24 10:24:42 2012 -0800 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux ) + SunOS | Linux | Darwin ) PS=":" FS="/" ;;
--- a/test/tools/javah/ConstMacroTest.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javah/ConstMacroTest.sh Tue Jan 24 10:24:42 2012 -0800 @@ -56,7 +56,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux ) + SunOS | Linux | Darwin ) PS=":" FS="/" ;;
--- a/test/tools/javah/MissingParamClassTest.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javah/MissingParamClassTest.sh Tue Jan 24 10:24:42 2012 -0800 @@ -58,7 +58,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux | CYGWIN* ) + SunOS | Linux | Darwin | CYGWIN* ) PS=":" FS="/" ;;
--- a/test/tools/javah/ReadOldClass.sh Tue Jan 24 08:56:19 2012 +0000 +++ b/test/tools/javah/ReadOldClass.sh Tue Jan 24 10:24:42 2012 -0800 @@ -43,7 +43,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux | CYGWIN* ) + SunOS | Linux | Darwin | CYGWIN* ) PS=":" FS="/" ;;