Mercurial > hg > release > icedtea8-forest-3.0
changeset 194:195fcceefddc icedtea7-1.13
Merge
author | andrew |
---|---|
date | Wed, 28 Apr 2010 22:05:14 +0100 |
parents | 8bab12c58534 (current diff) 7f1ba4459972 (diff) |
children | 525d1fc6ec1b |
files | .hgtags |
diffstat | 3 files changed, 145 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Feb 19 17:13:46 2010 +0000 +++ b/.hgtags Wed Apr 28 22:05:14 2010 +0100 @@ -59,3 +59,8 @@ 8403096d1fe7ff5318df9708cfec84a3fd3e1cf9 jdk7-b81 e1176f86805fe07fd9fb9da065dc51b47712ce76 jdk7-b82 6880a3af9addb41541e80ebe8cde6f79ec402a58 jdk7-b83 +2f3ea057d1ad56cf3b269cdc4de2741411151982 jdk7-b84 +cf26288a114be67c39f2758959ce50b60f5ae330 jdk7-b85 +433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86 +6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87 +82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88
--- a/make/jprt.properties Fri Feb 19 17:13:46 2010 +0000 +++ b/make/jprt.properties Wed Apr 28 22:05:14 2010 +0100 @@ -1,5 +1,5 @@ # -# Copyright 2006-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2006-2010 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 @@ -27,15 +27,15 @@ jprt.tools.default.release=jdk1.7.0 # Specific platform list -jprt.build.platforms=\ -solaris_sparc_5.10,\ -solaris_sparcv9_5.10,\ -solaris_i586_5.10,\ -solaris_x64_5.10,\ -linux_i586_2.6,\ -linux_x64_2.6,\ -windows_i586,\ -windows_x64 +jprt.build.platforms= \ + solaris_sparc_5.10, \ + solaris_sparcv9_5.10, \ + solaris_i586_5.10, \ + solaris_x64_5.10, \ + linux_i586_2.6, \ + linux_x64_2.6, \ + windows_i586_5.0, \ + windows_x64_5.2 # The different build flavors we want jprt.build.flavors=product,fastdebug @@ -51,6 +51,44 @@ 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 -jprt.test.targets=*-*-*-jvm98 +# Shortened list of vm tests +jprt.test.targets= \ + *-product-*-jvm98, \ + *-product-*-scimark, \ + *-product-*-runThese, \ + *-product-*-GCBasher_default, \ + *-product-*-GCOld_default, \ + *-product-*-jbb_default +# Test targets in test/Makefile +jprt.make.rule.test.targets= \ + *-product-*-langtools_jtreg, \ + *-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 + +# Not Ready Yet: +# *-product-*-jdk_awt +# *-product-*-jdk_rmi +# *-product-*-jdk_swing + +# Directories to be excluded from source bundles +jprt.bundle.exclude.src.dirs=build dist webrev +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/Makefile Wed Apr 28 22:05:14 2010 +0100 @@ -0,0 +1,90 @@ +# +# Copyright 2010 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. +# + +# +# Makefile to run tests from multiple sibling directories +# + +# Root of the forest that was built +TOPDIR=.. + +# This makefile depends on the availability of sibling directories. +LANGTOOLS_DIR=$(TOPDIR)/langtools +JDK_DIR=$(TOPDIR)/jdk + +# Macro to run a test target in a subdir +define SUBDIR_TEST # subdirectory target +if [ -d $1 ] ; then \ + if [ -r $1/test/Makefile ] ; then \ + echo "$(MAKE) -C $1/test $2" ; \ + $(MAKE) -C $1/test $2 ; \ + else \ + echo "ERROR: File does not exist: $1/test/Makefile"; \ + exit 1; \ + fi; \ +else \ + echo "WARNING: No testing done, directory does not exist: $1"; \ +fi +endef + +# Test target list for langtools repository +LANGTOOLS_TEST_LIST = langtools_jtreg + +# Test target list for jdk repository +JDK_TEST_LIST = \ + jdk_awt \ + jdk_beans jdk_beans1 jdk_beans2 jdk_beans3 \ + jdk_io \ + jdk_lang \ + jdk_management jdk_management1 jdk_management2 \ + jdk_math \ + jdk_misc \ + jdk_net \ + jdk_nio jdk_nio1 jdk_nio2 jdk_nio3 \ + jdk_rmi \ + jdk_security jdk_security1 jdk_security2 jdk_security3 \ + jdk_swing \ + jdk_text \ + jdk_tools jdk_tools1 jdk_tools2 \ + jdk_util + +# Default test target (everything) +all: $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST) + +# Test targets +$(LANGTOOLS_TEST_LIST): + @$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) +$(JDK_TEST_LIST): + @$(call SUBDIR_TEST, $(JDK_DIR), $@) + +clean: + +################################################################ + +# Phony targets (e.g. these are not filenames) +.PHONY: all clean $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST) + +################################################################ +