Merge

make/jprt.properties

 #
-# Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2006-2009 Sun Microsystems, Inc.  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
@@ -34,8 +34,8 @@ solaris_i586_5.10,\
 solaris_x64_5.10,\
 linux_i586_2.6,\
 linux_x64_2.6,\
-windows_i586,\
-windows_x64
+windows_i586_5.0,\
+windows_x64_5.2
 
 # The different build flavors we want
 jprt.build.flavors=product,fastdebug
@@ -51,21 +51,37 @@ jprt.run.flavor.c2.option=-server
 jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10
 jprt.solaris_x64.build.platform.match32=solaris_i586_5.10
 
-# Standard list of jprt test targets for this workspace
+# Standard test target for everybody
 jprt.test.targets=*-*-*-jvm98
-jprt.regression.test.targets=        \
-   *-product-*-java/lang,            \
-   *-product-*-java/security,        \
-   *-product-*-java/text,            \
-   *-product-*-java/util
 
-#jprt.regression.test.targets=   \
-#   *-product-*-java/awt,       \
-#   *-product-*-java/beans,     \
-#   *-product-*-java/io,        \
-#   *-product-*-java/net,       \
-#   *-product-*-java/nio,       \
-#   *-product-*-java/rmi,       \
+# Test targets in test/Makefile (some longer running tests only test c2)
+jprt.make.rule.test.targets=    \
+   *-product-*-jdk_beans1,      \
+   *-product-*-jdk_beans2,      \
+   *-product-*-jdk_beans3,      \
+   *-product-*-jdk_io,          \
+   *-product-*-jdk_lang,        \
+   *-product-*-jdk_management1, \
+   *-product-*-jdk_management2, \
+   *-product-*-jdk_math,        \
+   *-product-*-jdk_misc,        \
+   *-product-*-jdk_net,         \
+   *-product-*-jdk_nio1,        \
+   *-product-*-jdk_nio2,        \
+   *-product-*-jdk_nio3,        \
+   *-product-*-jdk_security1,   \
+   *-product-*-jdk_security2,   \
+   *-product-*-jdk_security3,   \
+   *-product-*-jdk_text,        \
+   *-product-*-jdk_tools1,      \
+   *-product-*-jdk_tools2,      \
+   *-product-*-jdk_util
+
+# Some of these are crashing Xvfb or windows manager, need dedicated DISPLAY per test batch
+jprt2.make.rule.test.targets=    \
+   *-product-*-jdk_awt,         \
+   *-product-*-jdk_rmi,         \
+   *-product-*-jdk_swing,       \
 
 # Directories needed to build
 jprt.bundle.exclude.src.dirs=build

test/start-Xvfb.sh

+#!/bin/sh -f
+#
+# Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun in the LICENSE file that accompanied this code.
+#
+# 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+#
+# Original Author: Tim Bell
+#
+usage() {
+   echo "Starts up an Xvfb dummy X server with fvwm2 window manager"
+   echo " usage:"
+   echo "    ${0} display_number_file"
+   echo "        display_number_file gets display number when it's ready"
+   exit
+ }
+#
+currentDir=`pwd`
+rm -f $1
+DD=":$$"
+DISPLAY=${DD}
+export DISPLAY
+cd /tmp
+#
+if [ ! -x "/usr/bin/X11/Xvfb" ]; then
+  # We have Solaris-flavored X windows, and the /usr/openwin Xvfb is
+  # a simple wrapper script around the Xsun server.  Massage the
+  # arguments: server number must be first; others are slightly
+  # different.
+  #
+  # Also the default Visual Class (DirectColor) triggers an awt bug
+  # (probably 4131533/6505852) and some tests will loop endlessly
+  # when they hit the display.  The workaround is:
+  #  1) Ask for PseudoColor instead.
+  #  2) Omit 32-bit depth.
+  /usr/bin/nohup /usr/openwin/bin/Xvfb ${DISPLAY} -dev vfb screen 0 1280x1024x24 pixdepths 8 16 24 defclass PseudoColor > ${currentDir}/nohup.$$ 2>&1 &
+else
+  # Linux...
+  /usr/bin/nohup /usr/bin/X11/Xvfb -fbdir ${currentDir} -pixdepths 8 16 24 32 ${DISPLAY} > ${currentDir}/nohup.$$ 2>&1 &
+fi
+WM="/usr/bin/X11/fvwm2"
+if [ ! -x ${WM} ] ; then
+  WM="/opt/sfw/bin/fvwm2"
+fi
+#
+# Wait for Xvfb to initialize:
+sleep 5
+#
+if [ -x "${WM}" ]; then
+# 2 JCK tests require a window manager
+# mwm fails (key name errors) and twm fails (hangs),
+# but fvwm2 works well.
+  /usr/bin/nohup ${WM} -display ${DISPLAY} -replace -f /dev/null > ${currentDir}/nohup.$$ 2>&1 &
+else
+  echo "Error: ${WM} not found"
+  exit 1
+fi
+#
+# Wait some more to see if the xhost command gets through:
+sleep 10
+# Allow access to all - this is a brute force approach,
+# but I do not see how it could be a security problem...
+DISPLAY="${DD}" xhost +
+#
+echo "Virtual frame buffer started on ${DISPLAY}"
+echo "$$" > $1
+wait