6928700: Configure top repo for JPRT testing

Sat, 06 Mar 2010 15:00:40 -0800

author
ohair
date
Sat, 06 Mar 2010 15:00:40 -0800
changeset 159
4d7419e4b759
parent 156
2f3ea057d1ad
child 160
f3664d6879ab

6928700: Configure top repo for JPRT testing
Reviewed-by: alanb, jjg

make/jprt.properties file | annotate | diff | comparison | revisions
test/Makefile file | annotate | diff | comparison | revisions
     1.1 --- a/make/jprt.properties	Fri Feb 12 13:25:03 2010 -0800
     1.2 +++ b/make/jprt.properties	Sat Mar 06 15:00:40 2010 -0800
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
     1.6 +# Copyright 2006-2010 Sun Microsystems, Inc.  All Rights Reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -27,15 +27,15 @@
    1.11  jprt.tools.default.release=jdk1.7.0
    1.12  
    1.13  # Specific platform list
    1.14 -jprt.build.platforms=\
    1.15 -solaris_sparc_5.10,\
    1.16 -solaris_sparcv9_5.10,\
    1.17 -solaris_i586_5.10,\
    1.18 -solaris_x64_5.10,\
    1.19 -linux_i586_2.6,\
    1.20 -linux_x64_2.6,\
    1.21 -windows_i586,\
    1.22 -windows_x64
    1.23 +jprt.build.platforms=   \
    1.24 +  solaris_sparc_5.10,   \
    1.25 +  solaris_sparcv9_5.10, \
    1.26 +  solaris_i586_5.10,    \
    1.27 +  solaris_x64_5.10,     \
    1.28 +  linux_i586_2.6,       \
    1.29 +  linux_x64_2.6,        \
    1.30 +  windows_i586_5.0,     \
    1.31 +  windows_x64_5.2
    1.32  
    1.33  # The different build flavors we want
    1.34  jprt.build.flavors=product,fastdebug
    1.35 @@ -51,6 +51,44 @@
    1.36  jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10
    1.37  jprt.solaris_x64.build.platform.match32=solaris_i586_5.10
    1.38  
    1.39 -# Standard list of jprt test targets for this workspace
    1.40 -jprt.test.targets=*-*-*-jvm98
    1.41 +# Shortened list of vm tests
    1.42 +jprt.test.targets=              \
    1.43 +  *-product-*-jvm98,            \
    1.44 +  *-product-*-scimark,          \
    1.45 +  *-product-*-runThese,         \
    1.46 +  *-product-*-GCBasher_default, \
    1.47 +  *-product-*-GCOld_default,    \
    1.48 +  *-product-*-jbb_default
    1.49  
    1.50 +# Test targets in test/Makefile
    1.51 +jprt.make.rule.test.targets=   \
    1.52 +  *-product-*-jdk_beans1,      \
    1.53 +  *-product-*-jdk_beans2,      \
    1.54 +  *-product-*-jdk_beans3,      \
    1.55 +  *-product-*-jdk_io,          \
    1.56 +  *-product-*-jdk_lang,        \
    1.57 +  *-product-*-jdk_management1, \
    1.58 +  *-product-*-jdk_management2, \
    1.59 +  *-product-*-jdk_math,        \
    1.60 +  *-product-*-jdk_misc,        \
    1.61 +  *-product-*-jdk_net,         \
    1.62 +  *-product-*-jdk_nio1,        \
    1.63 +  *-product-*-jdk_nio2,        \
    1.64 +  *-product-*-jdk_nio3,        \
    1.65 +  *-product-*-jdk_security1,   \
    1.66 +  *-product-*-jdk_security2,   \
    1.67 +  *-product-*-jdk_security3,   \
    1.68 +  *-product-*-jdk_text,        \
    1.69 +  *-product-*-jdk_tools1,      \
    1.70 +  *-product-*-jdk_tools2,      \
    1.71 +  *-product-*-jdk_util
    1.72 +
    1.73 +# Not Ready Yet:
    1.74 +#   *-product-*-langtools_all
    1.75 +#   *-product-*-jdk_awt
    1.76 +#   *-product-*-jdk_rmi
    1.77 +#   *-product-*-jdk_swing
    1.78 +
    1.79 +# Directories to be excluded from source bundles
    1.80 +jprt.bundle.exclude.src.dirs=build dist webrev
    1.81 +
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/Makefile	Sat Mar 06 15:00:40 2010 -0800
     2.3 @@ -0,0 +1,89 @@
     2.4 +#
     2.5 +# Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
     2.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 +#
     2.8 +# This code is free software; you can redistribute it and/or modify it
     2.9 +# under the terms of the GNU General Public License version 2 only, as
    2.10 +# published by the Free Software Foundation.  Sun designates this
    2.11 +# particular file as subject to the "Classpath" exception as provided
    2.12 +# by Sun in the LICENSE file that accompanied this code.
    2.13 +#
    2.14 +# This code is distributed in the hope that it will be useful, but WITHOUT
    2.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.16 +# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.17 +# version 2 for more details (a copy is included in the LICENSE file that
    2.18 +# accompanied this code).
    2.19 +#
    2.20 +# You should have received a copy of the GNU General Public License version
    2.21 +# 2 along with this work; if not, write to the Free Software Foundation,
    2.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.23 +#
    2.24 +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    2.25 +# CA 95054 USA or visit www.sun.com if you need additional information or
    2.26 +# have any questions.
    2.27 +#
    2.28 +
    2.29 +#
    2.30 +# Makefile to run tests from multiple sibling directories
    2.31 +#
    2.32 +
    2.33 +# Root of the forest that was built
    2.34 +TOPDIR=..
    2.35 +
    2.36 +# This makefile depends on the availability of sibling directories.
    2.37 +LANGTOOLS_DIR=$(TOPDIR)/langtools
    2.38 +JDK_DIR=$(TOPDIR)/jdk
    2.39 +
    2.40 +# Macro to run a test target in a subdir
    2.41 +define SUBDIR_TEST # subdirectory target
    2.42 +if [ -d $1 ] ; then \
    2.43 +  if [ -r $1/test/Makefile ] ; then \
    2.44 +    echo "$(MAKE) -C $1/test $2" ; \
    2.45 +    $(MAKE) -C $1/test $2 ; \
    2.46 +  else \
    2.47 +    echo "ERROR: File does not exist: $1/test/Makefile"; \
    2.48 +  fi; \
    2.49 +else \
    2.50 +  echo "WARNING: No testing done, directory does not exist: $1"; \
    2.51 +fi
    2.52 +endef
    2.53 +
    2.54 +# Test target list for langtools repository
    2.55 +LANGTOOLS_TEST_LIST = langtools_all
    2.56 +
    2.57 +# Test target list for jdk repository
    2.58 +JDK_TEST_LIST = \
    2.59 +	jdk_awt \
    2.60 +	jdk_beans jdk_beans1 jdk_beans2 jdk_beans3  \
    2.61 +	jdk_io  \
    2.62 +	jdk_lang  \
    2.63 +	jdk_management jdk_management1 jdk_management2  \
    2.64 +	jdk_math  \
    2.65 +	jdk_misc  \
    2.66 +	jdk_net  \
    2.67 +	jdk_nio jdk_nio1 jdk_nio2 jdk_nio3  \
    2.68 +	jdk_rmi \
    2.69 +	jdk_security jdk_security1 jdk_security2 jdk_security3  \
    2.70 +	jdk_swing \
    2.71 +	jdk_text  \
    2.72 +	jdk_tools jdk_tools1 jdk_tools2  \
    2.73 +	jdk_util
    2.74 +
    2.75 +# Default test target (everything)
    2.76 +all: $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST)
    2.77 +
    2.78 +# Test targets
    2.79 +$(LANGTOOLS_TEST_LIST):
    2.80 +	@$(call SUBDIR_TEST, $(LANGTOOLS_DIR), all)
    2.81 +$(JDK_TEST_LIST):
    2.82 +	@$(call SUBDIR_TEST, $(JDK_DIR), $@)
    2.83 +
    2.84 +clean:
    2.85 +
    2.86 +################################################################
    2.87 +
    2.88 +# Phony targets (e.g. these are not filenames)
    2.89 +.PHONY: all clean $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST)
    2.90 +
    2.91 +################################################################
    2.92 +

mercurial