United StatesChange Country, Oracle Worldwide Web Sites Communities I am a... I want to...
JDK-6928700 : Configure top repo for JPRT testing

Details
Type:
Enhancement
Submit Date:
2010-02-22
Status:
Resolved
Updated Date:
2014-03-03
Project Name:
JDK
Resolved Date:
2010-03-17
Component:
infrastructure
OS:
generic
Sub-Component:
build
CPU:
generic
Priority:
P3
Resolution:
Fixed
Affected Versions:
7
Fixed Versions:

Related Reports
Backport:
Backport:

Sub Tasks

Description
Create a top level test/Makefile that will run the test targets in jdk/test/Makefile and langtools/test/Makefile.

Also, configure the make/jprt.properties settings so that by default control builds include the above tests and also a select few hotspot vm tests. The lists of tests may need to be adjusted over time to keep the overall time under control.

                                    

Comments
SUGGESTED FIX

--- old/make/jprt.properties	Tue Feb 23 09:10:53 2010
+++ new/make/jprt.properties	Tue Feb 23 09:10:52 2010
@@ -34,8 +34,8 @@
 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,6 +51,46 @@
 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 (some longer running tests only test c2)
+jprt.make.rule.test.targets=    \
+   *-product-*-langtools_all,   \
+   *-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
 
--- /dev/null	Tue Feb 23 09:10:55 2010
+++ new/test/Makefile	Tue Feb 23 09:10:55 2010
@@ -0,0 +1,84 @@
+#
+# 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 various jdk tests
+#
+
+#
+# This makefile depends on the availability of sibling directories.
+#
+LANGTOOLS_DIR=../langtools
+JDK_DIR=../jdk
+
+# Run a test target in a subdir
+define SUBDIR_TEST
+if [ -d $1 ] ; then \
+  if [ -r $1/test/Makefile ] ; then \
+    $(MAKE) -C $1/test $2 ; \
+  else \
+    echo "ERROR: File does not exist: $1/test/Makefile"; \
+  fi; \
+else \
+  echo "WARNING: No testing done, directory does not exist: $1"; \
+fi
+endef
+
+# Default test target
+all: default
+
+# Test targets in langtools repository
+LANGTOOLS_TEST_LIST = langtools_all
+langtools_all:
+	$(call SUBDIR_TEST, $(LANGTOOLS_DIR), all)
+
+# Test targets in jdk repository
+JDK_TEST_LIST = \
+	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_security jdk_security1 jdk_security2 jdk_security3  \
+	jdk_text  \
+	jdk_tools jdk_tools1 jdk_tools2  \
+	jdk_util
+$(JDK_TEST_LIST):
+	$(call SUBDIR_TEST, $(JDK_DIR), $@)
+
+default: $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST)
+
+clean:
+
+################################################################
+
+# Phony targets (e.g. these are not filenames)
+.PHONY: all clean $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST)
+
+################################################################
+
                                     
2010-02-23
EVALUATION

See suggested fix.
                                     
2010-02-23
EVALUATION

http://hg.openjdk.java.net/jdk7/tl/rev/4d7419e4b759
                                     
2010-03-06



Hardware and Software, Engineered to Work Together