--- a/make/Jprt.gmk Tue Oct 02 21:38:54 2018 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-#
-# Copyright (c) 2012, 2016, 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. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This file contains targets and utilities needed by JPRT.
-
-# Cygpath is only defined when running on Cygwin
-ifneq ($(CYGPATH), )
- # If we get JPRT_ARCHIVE_*BUNDLE externally, make sure they have /cygdrive
- # style paths
- ifdef JPRT_ARCHIVE_BUNDLE
- override JPRT_ARCHIVE_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_BUNDLE))
- endif
- ifdef JPRT_ARCHIVE_TEST_BUNDLE
- override JPRT_ARCHIVE_TEST_BUNDLE := \
- $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_TEST_BUNDLE))
- endif
- ifdef JPRT_ARCHIVE_SYMBOLS_BUNDLE
- override JPRT_ARCHIVE_SYMBOLS_BUNDLE := \
- $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_SYMBOLS_BUNDLE))
- endif
-endif
-
-# When running in JPRT these will be provided. Need defaults so that this makefile
-# is valid anyway.
-ifndef JPRT_ARCHIVE_BUNDLE
- JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/jdk-image.zip
-endif
-ifndef JPRT_ARCHIVE_TEST_BUNDLE
- JPRT_ARCHIVE_TEST_BUNDLE=/tmp/jprt_bundles/test-image.zip
-endif
-ifndef JPRT_ARCHIVE_SYMBOLS_BUNDLE
- JPRT_ARCHIVE_SYMBOLS_BUNDLE=/tmp/jprt_bundles/symbols-image.zip
-endif
-
-ifeq ($(SKIP_BOOT_CYCLE), false)
- jprt_bundle: bootcycle-images
-endif
-
-################################################################################
-# JPRT specific bundling targets
-JPRT_TARGET ?= $(DEFAULT_MAKE_TARGET)
-ifeq ($(JPRT_TARGET), $(DEFAULT_MAKE_TARGET))
- jprt_bundle: $(DEFAULT_MAKE_TARGET) $(JPRT_ARCHIVE_BUNDLE) \
- $(JPRT_ARCHIVE_TEST_BUNDLE)
-
- SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
- SRC_TEST_IMAGE_DIR := $(TEST_IMAGE_DIR)
-
- # This target must be called in the context of a SPEC file
- $(JPRT_ARCHIVE_BUNDLE): product-images
- $(call MakeDir, $(@D))
- $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIPEXE) -y -q -r $@ .
-
- $(JPRT_ARCHIVE_TEST_BUNDLE): test-image
- $(call MakeDir, $(@D))
- $(CD) $(SRC_TEST_IMAGE_DIR) && $(ZIPEXE) -y -q -r $@ .
-
- ##############################################################################
- # Optional symbols bundle
- ifeq ($(GCOV_ENABLED), true)
- jprt_bundle: $(JPRT_ARCHIVE_SYMBOLS_BUNDLE)
-
- $(JPRT_ARCHIVE_SYMBOLS_BUNDLE): product-images
- $(call MakeDir, $(@D))
- $(CD) $(SYMBOLS_IMAGE_DIR) && $(ZIPEXE) -y -q -r $@ .
-
- endif
-
- ##############################################################################
-
-else
- # Just fake the main bundle to satisfy JPRT
- jprt_bundle: $(JPRT_TARGET)
- @$(call TargetEnter)
- $(MKDIR) -p $(OUTPUTDIR)/bundles
- $(CD) $(TOPDIR) && $(TAR) cf - README | $(GZIP) > \
- $(JPRT_ARCHIVE_BUNDLE)
- @$(call TargetExit)
-endif
-
-ALL_TARGETS += jprt_bundle
-
-################################################################################
-
-$(eval $(call IncludeCustomExtension, Jprt.gmk))
--- a/make/Main.gmk Tue Oct 02 21:38:54 2018 +0530
+++ b/make/Main.gmk Tue Oct 02 22:36:08 2018 -0700
@@ -1131,11 +1131,6 @@
################################################################################
-# Include JPRT targets
-include $(TOPDIR)/make/Jprt.gmk
-
-################################################################################
-
# The following targets are intentionally not added to ALL_TARGETS since they
# are internal only, to support Init.gmk.
--- a/make/conf/jib-profiles.js Tue Oct 02 21:38:54 2018 +0530
+++ b/make/conf/jib-profiles.js Tue Oct 02 22:36:08 2018 -0700
@@ -525,8 +525,7 @@
profiles[maketestName].default_make_targets = [ "test-make" ];
});
- // Profiles for building the zero jvm variant. These are used for verification
- // in JPRT.
+ // Profiles for building the zero jvm variant. These are used for verification.
var zeroProfiles = {
"linux-x64-zero": {
target_os: "linux",
@@ -733,18 +732,8 @@
});
});
- // Profiles used to run tests. Used in JPRT and Mach 5.
+ // Profiles used to run tests.
var testOnlyProfiles = {
- "run-test-jprt": {
- target_os: input.build_os,
- target_cpu: input.build_cpu,
- dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit", "jib" ],
- labels: "test",
- environment: {
- "JT_JAVA": common.boot_jdk_home
- }
- },
-
"run-test": {
target_os: input.build_os,
target_cpu: input.build_cpu,
@@ -806,7 +795,6 @@
+ "/Xcode.app/Contents/Developer/usr/bin"
};
profiles["run-test"] = concatObjects(profiles["run-test"], macosxRunTestExtra);
- profiles["run-test-jprt"] = concatObjects(profiles["run-test-jprt"], macosxRunTestExtra);
profiles["run-test-prebuilt"] = concatObjects(profiles["run-test-prebuilt"], macosxRunTestExtra);
}
// On windows we want the debug symbols available at test time
--- a/make/jprt.properties Tue Oct 02 21:38:54 2018 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,503 +0,0 @@
-#
-# Copyright (c) 2006, 2018, 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. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-##############
-#
-# Global settings
-#
-
-# Install test bundle for targets in jprt.test.bundle.targets set
-jprt.selective.test.bundle.installation=true
-
-# The current release name
-jprt.tools.default.release=jdk9
-
-# Allow concurrent changes to be merged in prior to pushing
-jprt.sync.push=true
-
-# Directories to be excluded from the source bundles
-jprt.bundle.exclude.src.dirs=build dist webrev ${jprt.bundle.exclude.src.dirs.extra}
-
-# Use configure when building
-jprt.build.use.configure=true
-jprt.build.use.jib=true
-jprt.test.use.jib=true
-jprt.jib.launcher=bin/jib.sh
-jprt.build.use.jib.publish=true
-
-# Clear out all the build needs as JIB handles this
-jprt.jdk9.build.needs=
-jprt.macosx.jdk9.build.needs=
-jprt.windows_i586.jdk9.build.needs=
-jprt.windows_x64.jdk9.build.needs=
-jprt.solaris.jdk9.build.needs=
-jprt.linux_i586.jdk9.build.needs=
-jprt.linux_x64.jdk9.build.needs=
-jprt.linux_armv6.jdk9.build.needs=
-jprt.linux_armvh.jdk9.build.needs=
-jprt.linux_arm64.jdk9.build.needs=
-jprt.linux_armsflt.jdk9.build.needs=
-jprt.linux_armvfpsflt.jdk9.build.needs=
-jprt.linux_armvfphflt.jdk9.build.needs=
-jprt.linux_armv6vfphflt.jdk9.build.needs=
-jprt.solaris.client.build.needs=
-jprt.linux.client.build.needs=
-jprt.solaris.jdk9.compiler=
-jprt.linux.jdk9.compiler=
-jprt.jdk9.test.needs=
-
-# Disable the need for preinstalled Visual Studio and Xcode
-jprt.windows.jdk9.compiler=
-jprt.windows.6.2.jdk9.compiler=
-jprt.windows.6.3.jdk9.compiler=
-jprt.windows.jdk9.target.attribute.compilerVS2013.appliesTo.builds=none
-jprt.macosx.jdk9.target.attribute.compilerXcode511.appliesTo.builds=none
-
-# Set up the run flavors (jvm variants)
-jprt.run.flavors=c2,default,${my.additional.run.flavors}
-
-# Setup jib profiles
-jprt.linux_i586.product.build.jib.profile=linux-x86
-jprt.linux_x64.product.build.jib.profile=linux-x64
-jprt.macosx_x64.product.build.jib.profile=macosx-x64
-jprt.solaris_sparcv9.product.build.jib.profile=solaris-sparcv9
-jprt.solaris_x64.product.build.jib.profile=solaris-x64
-jprt.windows_i586.product.build.jib.profile=windows-x86
-jprt.windows_x64.product.build.jib.profile=windows-x64
-
-jprt.linux_i586.fastdebug.build.jib.profile=linux-x86-debug
-jprt.linux_x64.fastdebug.build.jib.profile=linux-x64-debug
-jprt.macosx_x64.fastdebug.build.jib.profile=macosx-x64-debug
-jprt.solaris_sparcv9.fastdebug.build.jib.profile=solaris-sparcv9-debug
-jprt.solaris_x64.fastdebug.build.jib.profile=solaris-x64-debug
-jprt.windows_i586.fastdebug.build.jib.profile=windows-x86-debug
-jprt.windows_x64.fastdebug.build.jib.profile=windows-x64-debug
-
-jprt.linux_i586.slowdebug.build.jib.profile=linux-x86-slowdebug
-jprt.linux_x64.slowdebug.build.jib.profile=linux-x64-slowdebug
-jprt.macosx_x64.slowdebug.build.jib.profile=macosx-x64-slowdebug
-jprt.solaris_sparcv9.slowdebug.build.jib.profile=solaris-sparcv9-slowdebug
-jprt.solaris_x64.slowdebug.build.jib.profile=solaris-x64-slowdebug
-jprt.windows_i586.slowdebug.build.jib.profile=windows-x86-slowdebug
-jprt.windows_x64.slowdebug.build.jib.profile=windows-x64-slowdebug
-
-jprt.linux_i586.productOpen.build.jib.profile=linux-x86-open
-jprt.linux_x64.productOpen.build.jib.profile=linux-x64-open
-jprt.macosx_x64.productOpen.build.jib.profile=macosx-x64-open
-jprt.solaris_sparcv9.productOpen.build.jib.profile=solaris-sparcv9-open
-jprt.solaris_x64.productOpen.build.jib.profile=solaris-x64-open
-jprt.windows_i586.productOpen.build.jib.profile=windows-x86-open
-jprt.windows_x64.productOpen.build.jib.profile=windows-x64-open
-
-jprt.linux_i586.fastdebugOpen.build.jib.profile=linux-x86-open-debug
-jprt.linux_x64.fastdebugOpen.build.jib.profile=linux-x64-open-debug
-jprt.macosx_x64.fastdebugOpen.build.jib.profile=macosx-x64-open-debug
-jprt.solaris_sparcv9.fastdebugOpen.build.jib.profile=solaris-sparcv9-open-debug
-jprt.solaris_x64.fastdebugOpen.build.jib.profile=solaris-x64-open-debug
-jprt.windows_i586.fastdebugOpen.build.jib.profile=windows-x86-open-debug
-jprt.windows_x64.fastdebugOpen.build.jib.profile=windows-x64-open-debug
-
-jprt.linux_i586.productZero.build.jib.profile=linux-x86-zero
-jprt.linux_x64.productZero.build.jib.profile=linux-x64-zero
-
-jprt.linux_i586.fastdebugZero.build.jib.profile=linux-x86-zero-debug
-jprt.linux_x64.fastdebugZero.build.jib.profile=linux-x64-zero-debug
-
-jprt.test.jib.profile=run-test-jprt
-
-# Set make target to use for different build flavors
-jprt.build.flavor.fastdebugOpen.target=jprt_bundle
-jprt.build.flavor.fastdebug.target=jprt_bundle
-jprt.build.flavor.product.target=jprt_bundle
-jprt.build.flavor.productOpen.target=jprt_bundle
-jprt.build.flavor.optimized.target=jprt_bundle
-jprt.build.flavor.optimizedOpen.target=jprt_bundle
-jprt.build.flavor.slowdebug.target=jprt_bundle
-jprt.build.flavor.productZero.target=jprt_bundle
-jprt.build.flavor.fastdebugZero.target=jprt_bundle
-
-# Use these configure args to define debug level or provide specific
-# configuration details not covered by Jib profiles.
-jprt.slowdebug.build.configure.args=
-jprt.fastdebug.build.configure.args=--disable-precompiled-headers
-# Don't disable precompiled headers on windows. It's simply too slow.
-jprt.windows_i586.fastdebug.build.configure.args=
-jprt.windows_x64.fastdebug.build.configure.args=
-jprt.windows_i586.fastdebugOpen.build.configure.args=
-jprt.windows_x64.fastdebugOpen.build.configure.args=
-jprt.product.build.configure.args=
-jprt.optimized.build.configure.args=--with-debug-level=optimized
-jprt.slowdebugOpen.build.configure.args=${jprt.slowdebug.build.configure.args}
-jprt.fastdebugOpen.build.configure.args=${jprt.fastdebug.build.configure.args}
-jprt.productOpen.build.configure.args=${jprt.product.build.configure.args}
-jprt.optimizedOpen.build.configure.args=${jprt.product.build.configure.args}
-
-
-# hotspot testset has custom build flavors and build targets
-my.jprt.testsetHasCustomBuildFlavors.hotspot=true
-my.jprt.testsetHasCustomBuildTargets.hotspot=true
-my.jprt.testsetHasCustomBuildFlavors.buildinfra=true
-my.jprt.testsetHasCustomBuildTargets.buildinfra=true
-
-# determine if the specified testset has custom build flavors or build targets
-my.jprt.testsetHasCustomBuildFlavors=${my.jprt.testsetHasCustomBuildFlavors.${jprt.test.set}}
-my.jprt.testsetHasCustomBuildTargets=${my.jprt.testsetHasCustomBuildTargets.${jprt.test.set}}
-
-# Select build flavors and build targets based on the specified testset
-jprt.build.flavors=${my.jprt.testsetHasCustomBuildFlavors ? \
- ${my.build.flavors.${jprt.test.set}} : ${my.build.flavors.default}}
-jprt.build.targets=${my.jprt.testsetHasCustomBuildTargets ? \
- ${my.build.targets.${jprt.test.set}} : ${my.build.targets.default}}
-
-# Select test targets - jprt default for jprt.test.set is "default"
-jprt.test.targets=${my.test.targets.${jprt.test.set}}
-jprt.make.rule.test.targets=${my.make.rule.test.targets.${jprt.test.set}}
-
-# Not all test targets need the test image
-jprt.test.bundle.targets=\
- ${my.make.rule.test.targets.svc}, \
- ${my.make.rule.test.targets.hotspot.reg}, \
- ${my.make.rule.test.targets.hotspot.gtest} \
- ${my.make.rule.test.targets.nativesanity} \
- ${my.test.target.set:TESTNAME=jdk_lang} \
- ${my.test.target.set:TESTNAME=jdk_nio}
-
-# 7155453: Work-around to prevent popups on OSX from blocking test completion
-# but the work-around is added to all platforms to be consistent
-jprt.jbb.options=-Djava.awt.headless=true
-
-########
-#
-# Build options (generic)
-#
-
-# Configure args common to all builds
-# Also allows for additional, testset specific configure arguments to be set
-jprt.build.configure.args= \
- --with-output-sync=recurse \
- --with-jobs=$ALT_PARALLEL_COMPILE_JOBS \
- --with-version-opt=$JPRT_JOB_ID \
- ${my.additional.build.configure.args.${jprt.test.set}} \
- ${my.custom.build.configure.args}
-
-########
-#
-# Build targets and options (default/jdk)
-#
-
-# The default build flavors
-my.build.flavors.default=fastdebug,product
-
-# Standard list of jprt build targets for this source tree
-my.build.targets.default= \
- solaris_sparcv9_5.11-{product|fastdebug}, \
- solaris_x64_5.11-{product|fastdebug}, \
- linux_i586_3.8-{product|fastdebug}, \
- linux_x64_3.8-{product|fastdebug}, \
- macosx_x64_10.9-{product|fastdebug}, \
- windows_i586_6.3-{product|fastdebug}, \
- windows_x64_6.3-{product|fastdebug}, \
- ${my.additional.build.targets.default}
-
-# Test target list (no fastdebug & limited c2 testing)
-my.test.target.set= \
- solaris_sparcv9_5.11-product-c2-TESTNAME, \
- solaris_x64_5.11-product-c2-TESTNAME, \
- linux_i586_3.8-product-c2-TESTNAME, \
- linux_x64_3.8-product-c2-TESTNAME, \
- macosx_x64_10.9-product-c2-TESTNAME, \
- windows_i586_6.3-product-c2-TESTNAME, \
- windows_x64_6.3-product-c2-TESTNAME
-
-# Default vm test targets (testset=default)
-my.test.targets.default= \
- ${my.test.target.set:TESTNAME=jvm98}, \
- ${my.test.target.set:TESTNAME=scimark}
-
-# Default jdk test targets (testset=default)
-my.make.rule.test.targets.default= \
- ${my.test.target.set:TESTNAME=langtools_jtreg}, \
- ${my.test.target.set:TESTNAME=jdk_lang}, \
- ${my.test.target.set:TESTNAME=jdk_math}, \
- ${my.test.target.set:TESTNAME=jdk_util}
-
-# Default vm test targets (testset=core)
-my.test.targets.core=
-
-# Core jdk test targets (testset=core)
-my.make.rule.test.targets.core= \
- ${my.test.target.set:TESTNAME=jdk_lang}, \
- ${my.test.target.set:TESTNAME=jdk_math}, \
- ${my.test.target.set:TESTNAME=jdk_util}, \
- ${my.test.target.set:TESTNAME=jdk_io}, \
- ${my.test.target.set:TESTNAME=jdk_net}, \
- ${my.test.target.set:TESTNAME=jdk_nio}, \
- ${my.test.target.set:TESTNAME=jdk_security1}, \
- ${my.test.target.set:TESTNAME=jdk_security2}, \
- ${my.test.target.set:TESTNAME=jdk_security3}, \
- ${my.test.target.set:TESTNAME=jdk_security4}, \
- ${my.test.target.set:TESTNAME=jdk_rmi}, \
- ${my.test.target.set:TESTNAME=jdk_text}, \
- ${my.test.target.set:TESTNAME=jdk_time}, \
- ${my.test.target.set:TESTNAME=jdk_other}, \
- ${my.test.target.set:TESTNAME=core_tools}
-
-# Svc vm test targets (testset=svc)
-my.test.targets.svc=
-
-# Core jdk test targets (testset=svc)
-my.make.rule.test.targets.svc= \
- ${my.test.target.set:TESTNAME=jdk_management}, \
- ${my.test.target.set:TESTNAME=jdk_instrument}, \
- ${my.test.target.set:TESTNAME=jdk_jmx}, \
- ${my.test.target.set:TESTNAME=jdk_jdi}, \
- ${my.test.target.set:TESTNAME=jdk_jfr}, \
- ${my.test.target.set:TESTNAME=svc_tools}, \
- ${my.make.rule.test.targets.svc.extra}
-
-# JAXP vm test targets (testset=jaxp)
-my.test.targets.jaxp=
-
-# JAXP test targets (testset=jaxp)
-my.make.rule.test.targets.jaxp= \
- ${my.test.target.set:TESTNAME=jaxp_all}
-
-# All vm test targets (testset=all)
-my.test.targets.all= \
- ${my.test.targets.default}, \
- ${my.test.target.set:TESTNAME=runThese}, \
- ${my.test.target.set:TESTNAME=jbb_default}
-
-# All jdk test targets (testset=all)
-my.make.rule.test.targets.all= \
- ${my.make.rule.test.targets.core}, \
- ${my.make.rule.test.targets.svc}, \
- ${my.test.target.set:TESTNAME=jdk_awt}, \
- ${my.test.target.set:TESTNAME=jdk_beans}, \
- ${my.test.target.set:TESTNAME=jdk_sound}, \
- ${my.test.target.set:TESTNAME=jdk_swing}
-
-# PIT vm test targets (testset=pit)
-my.test.targets.pit= \
- ${my.test.targets.all}
-
-# PIT jdk test targets (testset=pit)
-my.make.rule.test.targets.pit= \
- ${my.test.target.set:TESTNAME=langtools_jtreg}, \
- ${my.make.rule.test.targets.core}, \
- ${my.make.rule.test.targets.svc} \
- ${my.make.rule.test.targets.jaxp}
-
-# JCK test targets in test/Makefile (no windows)
-my.test.target.set.jck= \
- solaris_sparcv9_5.11-product-c2-JCK7TESTRULE, \
- solaris_x64_5.11-product-c2-JCK7TESTRULE, \
- linux_i586_3.8-product-c2-JCK7TESTRULE, \
- linux_x64_3.8-product-c2-JCK7TESTRULE
-
-# JCK testset targets
-my.make.rule.test.targets.jck= \
- ${my.test.target.set.jck:JCK7TESTRULE=jck7devtools}, \
- ${my.test.target.set.jck:JCK7TESTRULE=jck7runtime}, \
- ${my.test.target.set.jck:JCK7TESTRULE=jck7compiler}
-
-
-#############
-#
-# Hotspot related settings (testset=hotspot)
-#
-
-# The hotspot build flavors
-my.build.flavors.hotspot= \
- fastdebugOpen,fastdebug,product,productOpen,optimized,optimizedOpen \
- ${my.additional.build.flavors.hotspot}
-
-# Platforms built for hotspot push jobs
-my.build.targets.hotspot= \
- solaris_sparcv9_5.11-{product|fastdebug}, \
- solaris_x64_5.11-{product|fastdebug}, \
- linux_i586_3.8-{product|fastdebug}, \
- linux_x64_3.8-{product|fastdebug}, \
- macosx_x64_10.9-{product|fastdebug}, \
- windows_i586_6.3-{product|fastdebug}, \
- windows_x64_6.3-{product|fastdebug}, \
- solaris_x64_5.11-{fastdebugOpen}, \
- linux_x64_3.8-{productOpen}, \
- ${my.additional.build.targets.hotspot}
-
-# Tests to run on the various platforms for hotspot push jobs
-my.test.targets.hotspot.solaris.sparcv9= \
- solaris_sparcv9_5.11-{product|fastdebug}-c2-jvm98, \
- solaris_sparcv9_5.11-{product|fastdebug}-c2-jvm98_nontiered, \
- solaris_sparcv9_5.11-{product|fastdebug}-c2-scimark, \
- solaris_sparcv9_5.11-product-c2-runThese8,
-
-my.test.targets.hotspot.solaris.x64= \
- solaris_x64_5.11-{product|fastdebug}-c2-jvm98, \
- solaris_x64_5.11-{product|fastdebug}-c2-jvm98_nontiered, \
- solaris_x64_5.11-{product|fastdebug}-c2-scimark, \
- solaris_x64_5.11-product-c2-runThese8, \
- solaris_x64_5.11-product-c2-runThese8_Xcomp_lang, \
- solaris_x64_5.11-product-c2-runThese8_Xcomp_vm,
-
-my.test.targets.hotspot.linux.i586= \
- linux_i586_3.8-{product|fastdebug}-c2-jvm98, \
- linux_i586_3.8-{product|fastdebug}-c2-jvm98_nontiered, \
- linux_i586_3.8-{product|fastdebug}-c2-scimark, \
- linux_i586_3.8-fastdebug-c2-runThese8_Xcomp_lang, \
- linux_i586_3.8-fastdebug-c2-runThese8_Xcomp_vm
-
-my.test.targets.hotspot.linux.x64= \
- linux_x64_3.8-{product|fastdebug}-c2-jvm98, \
- linux_x64_3.8-{product|fastdebug}-c2-jvm98_nontiered, \
- linux_x64_3.8-{product|fastdebug}-c2-scimark
-
-my.test.targets.hotspot.macosx.x64= \
- macosx_x64_10.9-{product|fastdebug}-c2-jvm98, \
- macosx_x64_10.9-{product|fastdebug}-c2-jvm98_nontiered, \
- macosx_x64_10.9-{product|fastdebug}-c2-scimark
-
-my.test.targets.hotspot.windows.i586= \
- windows_i586_6.3-{product|fastdebug}-c2-jvm98, \
- windows_i586_6.3-{product|fastdebug}-c2-jvm98_nontiered, \
- windows_i586_6.3-{product|fastdebug}-c2-scimark, \
- windows_i586_6.3-product-c2-runThese8, \
- windows_i586_6.3-product-c2-runThese8_Xcomp_lang, \
- windows_i586_6.3-product-c2-runThese8_Xcomp_vm,
-
-my.test.targets.hotspot.windows.x64= \
- windows_x64_6.3-{product|fastdebug}-c2-jvm98, \
- windows_x64_6.3-{product|fastdebug}-c2-jvm98_nontiered, \
- windows_x64_6.3-{product|fastdebug}-c2-scimark, \
- windows_x64_6.3-product-c2-runThese8, \
- windows_x64_6.3-product-c2-runThese8_Xcomp_lang, \
- windows_x64_6.3-product-c2-runThese8_Xcomp_vm,
-
-# Some basic "smoke" tests for OpenJDK builds
-my.test.targets.hotspot.open= \
- solaris_x64_5.11-{productOpen|fastdebugOpen}-c2-jvm98, \
- linux_x64_3.8-{productOpen|fastdebugOpen}-c2-jvm98
-
-# The complete list of test targets for jprt
-my.test.targets.hotspot= \
- ${my.test.targets.hotspot.open}, \
- ${my.test.targets.hotspot.solaris.sparcv9}, \
- ${my.test.targets.hotspot.solaris.x64}, \
- ${my.test.targets.hotspot.linux.i586}, \
- ${my.test.targets.hotspot.linux.x64}, \
- ${my.test.targets.hotspot.macosx.x64}, \
- ${my.test.targets.hotspot.windows.i586}, \
- ${my.test.targets.hotspot.windows.x64}, \
- ${my.test.targets.hotspot.solaris.sparcv9}, \
- ${my.test.targets.hotspot.solaris.x64}, \
- ${my.test.targets.hotspot.linux.x64}, \
- ${my.test.targets.hotspot.windows.i586}, \
- ${my.test.targets.hotspot.windows.x64}, \
- ${my.additional.test.targets.hotspot}
-
-
-# Make file based test targets
-
-my.make.rule.test.targets.hotspot.gtest= \
- linux_i586_3.8-*-default-hotspot_gtest, \
- linux_x64_3.8-*-default-hotspot_gtest, \
- macosx_x64_10.9-*-default-hotspot_gtest, \
- solaris_sparcv9_5.11-*-default-hotspot_gtest, \
- solaris_x64_5.11-*-default-hotspot_gtest, \
- windows_i586_6.3-*-default-hotspot_gtest, \
- windows_x64_6.3-*-default-hotspot_gtest, \
- ${my.additional.make.rule.test.targets.hotspot.gtest}
-
-my.make.rule.test.targets.hotspot.reg.group= \
- solaris_sparcv9_5.11-fastdebug-c2-GROUP, \
- solaris_x64_5.11-fastdebug-c2-GROUP, \
- linux_i586_3.8-fastdebug-c2-GROUP, \
- linux_x64_3.8-fastdebug-c2-GROUP, \
- macosx_x64_10.9-fastdebug-c2-GROUP, \
- windows_i586_6.3-fastdebug-c2-GROUP, \
- windows_x64_6.3-fastdebug-c2-GROUP
-
-# Hotspot jtreg tests
-my.make.rule.test.targets.hotspot.reg= \
- ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_tier1_compiler_1}, \
- ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_tier1_compiler_2}, \
- ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_tier1_compiler_3}, \
- ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_tier1_compiler_closed}, \
- ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_tier1_gc_1}, \
- ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_tier1_gc_2}, \
- ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_tier1_gc_closed}, \
- ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_tier1_gc_gcold}, \
- ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_tier1_gc_gcbasher}, \
- ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_tier1_runtime}, \
- ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_tier1_serviceability}, \
- ${my.make.rule.test.targets.hotspot.reg.group:GROUP=jdk_svc_sanity}, \
- solaris_sparcv9_5.11-product-c2-hotspot_tier1_gc_gcbasher, \
- solaris_x64_5.11-product-c2-hotspot_tier1_gc_gcbasher, \
- linux_i586_3.8-product-c2-hotspot_tier1_gc_gcbasher, \
- linux_x64_3.8-product-c2-hotspot_tier1_gc_gcbasher, \
- macosx_x64_10.9-product-c2-hotspot_tier1_gc_gcbasher, \
- windows_i586_6.3-product-c2-hotspot_tier1_gc_gcbasher, \
- windows_x64_6.3-product-c2-hotspot_tier1_gc_gcbasher, \
- ${my.additional.make.rule.test.targets.hotspot.reg}
-
-# Other Makefile based Hotspot tests
-my.make.rule.test.targets.hotspot.other= \
- ${my.make.rule.test.targets.hotspot.gtest}, \
- ${my.additional.make.rule.test.targets.hotspot.other}
-
-# All the makefile based tests to run
-my.make.rule.test.targets.hotspot= \
- ${my.make.rule.test.targets.hotspot.reg} \
- ${my.make.rule.test.targets.hotspot.other}
-
-# Native jdk and hotspot test targets (testset=nativesanity)
-my.make.rule.test.targets.nativesanity= \
- ${my.test.target.set:TESTNAME=jdk_native_sanity}, \
- ${my.test.target.set:TESTNAME=hotspot_native_sanity}
-
-################################################################################
-# Testset buildinfra
-my.build.flavors.buildinfra = \
- product,fastdebug,slowdebug,productZero,fastdebugZero \
- ${my.additional.build.flavors.buildinfra}
-
-# Platforms built for hotspot push jobs
-my.build.targets.buildinfra = \
- solaris_sparcv9_5.11-{product|fastdebug|slowdebug}, \
- solaris_x64_5.11-{product|fastdebug|slowdebug}, \
- linux_i586_3.8-{product|fastdebug|slowdebug|productZero|fastdebugZero}, \
- linux_x64_3.8-{product|fastdebug|slowdebug|productZero|fastdebugZero}, \
- macosx_x64_10.9-{product|fastdebug|slowdebug}, \
- windows_i586_6.3-{product|fastdebug|slowdebug}, \
- windows_x64_6.3-{product|fastdebug|slowdebug}, \
- ${my.additional.build.targets.buildinfra}
-
-my.test.targets.buildinfra = \
- ${my.test.targets.default}, \
- ${my.test.targets.hotspot}
-
-my.make.rule.test.targets.buildinfra = \
- ${my.make.rule.test.targets.default}, \
- ${my.make.rule.test.targets.hotspot}
--- a/src/hotspot/os/linux/os_linux.cpp Tue Oct 02 21:38:54 2018 +0530
+++ b/src/hotspot/os/linux/os_linux.cpp Tue Oct 02 22:36:08 2018 -0700
@@ -1569,9 +1569,6 @@
// This is OK - No Java threads have been created yet, and hence no
// stack guard pages to fix.
//
- // This should happen only when you are building JDK7 using a very
- // old version of JDK6 (e.g., with JPRT) and running test_gamma.
- //
// Dynamic loader will make all stacks executable after
// this function returns, and will not do that again.
assert(Threads::number_of_threads() == 0, "no Java threads should exist yet.");
--- a/test/TestCommon.gmk Tue Oct 02 21:38:54 2018 +0530
+++ b/test/TestCommon.gmk Tue Oct 02 22:36:08 2018 -0700
@@ -118,7 +118,7 @@
ABS_TEST_OUTPUT_DIR := $(ABS_PLATFORM_BUILD_ROOT)/testoutput/$(UNIQUE_DIR)
endif
-# Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test)
+# If unset, set up the PRODUCT_HOME variable to the jdk to test
ifndef PRODUCT_HOME
# Try to use images/jdk if it exists
ABS_JDK_IMAGE = $(ABS_PLATFORM_BUILD_ROOT)/images/jdk
@@ -145,28 +145,12 @@
JTREG_BASIC_OPTIONS += -e:_NT_SYMBOL_PATH='$(_NT_SYMBOL_PATH)'
endif
-# Expect JPRT to set JPRT_PRODUCT_ARGS (e.g. -server etc.)
-# Should be passed into 'java' only.
-# Could include: -d64 -server -client OR any java option
-ifdef JPRT_PRODUCT_ARGS
- JAVA_ARGS = $(JPRT_PRODUCT_ARGS)
-endif
-
-# Expect JPRT to set JPRT_PRODUCT_VM_ARGS (e.g. -Xcomp etc.)
-# Should be passed into anything running the vm (java, javac, javadoc, ...).
-ifdef JPRT_PRODUCT_VM_ARGS
- JAVA_VM_ARGS = $(JPRT_PRODUCT_VM_ARGS)
-endif
-
ifneq ($(NATIVE_TEST_PATH), )
# jtreg -nativepath <dir>
#
- # Local make tests will be TEST_IMAGE_DIR and JPRT with jprt.use.reg.test.bundle=true
- # should be JPRT_TESTNATIVE_PATH
+ # Local make tests will be TEST_IMAGE_DIR
ifdef TEST_IMAGE_DIR
TESTNATIVE_DIR = $(TEST_IMAGE_DIR)
- else ifdef JPRT_TESTNATIVE_PATH
- TESTNATIVE_DIR = $(JPRT_TESTNATIVE_PATH)
endif
ifdef TESTNATIVE_DIR
JTREG_NATIVE_PATH = -nativepath:$(shell $(GETMIXEDPATH) "$(TESTNATIVE_DIR)/$(NATIVE_TEST_PATH)")
@@ -208,11 +192,6 @@
TEST_PREREQS += $(CDS_ARCHIVE_FILE)
endif
-# Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results)
-ifdef JPRT_ARCHIVE_BUNDLE
- ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE)
-endif
-
# How to create the test bundle (pass or fail, we want to create this)
# Follow command with ";$(BUNDLE_UP_AND_EXIT)", so it always gets executed.
ifneq ($(ARCHIVE_BUNDLE), )
@@ -340,9 +319,6 @@
# Expect JT_HOME to be set for jtreg tests. (home for jtreg)
ifndef JT_HOME
JT_HOME = $(SLASH_JAVA)/re/jtreg/$(USE_JTREG_VERSION)/promoted/latest/binaries/jtreg
- ifdef JPRT_JTREG_HOME
- JT_HOME = $(JPRT_JTREG_HOME)
- endif
endif
# Problematic tests to be excluded
@@ -358,7 +334,7 @@
# ------------------------------------------------------------------
-# When called from JPRT the TESTDIRS variable is set to the jtreg tests to run
+# The TESTDIRS variable can be used to select the jtreg tests to run
ifdef TESTDIRS
TEST_SELECTION = $(TESTDIRS)
endif
--- a/test/hotspot/jtreg/TEST.groups Tue Oct 02 21:38:54 2018 +0530
+++ b/test/hotspot/jtreg/TEST.groups Tue Oct 02 22:36:08 2018 -0700
@@ -258,7 +258,7 @@
hotspot_appcds = \
runtime/appcds/
-# A subset of AppCDS tests to be run in JPRT push
+# A subset of AppCDS tests to be run in tier1
tier1_runtime_appcds = \
runtime/appcds/HelloTest.java \
runtime/appcds/sharedStrings/SharedStringsBasic.java \
--- a/test/hotspot/jtreg/jprt.config Tue Oct 02 21:38:54 2018 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +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`
-case "${osname}" in
- SunOS )
- # 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/bin
-
- # Find GNU make
- make=/usr/bin/gmake
- if [ ! -f ${make} ] ; then
- make=/usr/gnu/bin/make
- if [ ! -f ${make} ] ; then
- make=${slashjava}/devtools/${solaris_arch}/bin/gnumake
- fi
- fi
- fileMustExist "${make}" make
-
- # File creation mask
- umask 002
- ;;
-
- Linux | Darwin )
- # Add basic paths
- path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
-
- # Find GNU make
- make=/usr/bin/make
- fileMustExist "${make}" make
-
- umask 002
- ;;
-
- FreeBSD | OpenBSD )
- # Add basic paths
- path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
-
- # Find GNU make
- make=/usr/local/bin/gmake
- fileMustExist "${make}" make
-
- umask 002
- ;;
-
- NetBSD )
- # Add basic paths
- path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
-
- # Find GNU make
- make=/usr/pkg/bin/gmake
- fileMustExist "${make}" make
-
- umask 002
- ;;
-
- * )
- # 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
- ;;
-esac
-
-# Export PATH setting
-PATH="${path4sdk}"
-export PATH
-
--- a/test/jdk/ProblemList.txt Tue Oct 02 21:38:54 2018 +0530
+++ b/test/jdk/ProblemList.txt Tue Oct 02 22:36:08 2018 -0700
@@ -102,7 +102,7 @@
# 1. Make sure test passes on all platforms with samevm, or mark it othervm
# 2. Make sure test passes on all platforms when run with it's entire group
# 3. Make sure both VMs are tested, -server and -client, if possible
-# 4. Use a tool like JPRT or something to verify these results
+# 4. Use your favorite build and test system to verify these results
# 5. Delete lines in this file, include the changes with your test changes
#
# You may need to repeat your testing 2 or even 3 times to verify good
--- a/test/jdk/TEST.groups Tue Oct 02 21:38:54 2018 +0530
+++ b/test/jdk/TEST.groups Tue Oct 02 22:36:08 2018 -0700
@@ -259,11 +259,7 @@
jdk_native_sanity = \
native_sanity
-# java launcher specific tests, Note: do not include this group into any groups
-# that potentially could be included into a jprt test rule, as the complementary
-# closed group includes awt SplashScreen and these tests may not run
-# satisfactorily on all platforms and profiles thus this group must always
-# be a stand-alone group
+# java launcher specific tests.
jdk_launcher = \
tools/launcher \
sun/tools
@@ -407,9 +403,6 @@
#
# These groups specify a subset of Serviceability tests that are supposed to
# guard against breakage of Serviceability features by other component teams.
-# They are added to the "hotspot" testset in JPRT so that they will run on all
-# full-forest pushes through JPRT.
-#
jdk_svc_sanity = \
:jdk_management_sanity \
--- a/test/jdk/com/sun/jdi/cds/CDSJDITest.java Tue Oct 02 21:38:54 2018 +0530
+++ b/test/jdk/com/sun/jdi/cds/CDSJDITest.java Tue Oct 02 22:36:08 2018 -0700
@@ -46,7 +46,7 @@
// These first three properties are setup by jtreg, and must be passed
// to the JDI test subprocess because it needs them in order to
// pass them to the subprocess it will create for the debuggee. This
- // is how the JPRT -javaopts are passed to the debggee. See
+ // is how the -javaopts are passed to the debuggee. See
// VMConnection.getDebuggeeVMOptions().
getPropOpt("test.classes"),
getPropOpt("test.java.opts"),
--- a/test/jdk/java/lang/String/CompactString/CompactString.java Tue Oct 02 21:38:54 2018 +0530
+++ b/test/jdk/java/lang/String/CompactString/CompactString.java Tue Oct 02 22:36:08 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -275,8 +275,7 @@
}
/*
- * Because right now system default charset in JPRT environment is only
- * guaranteed to support ASCII characters in log, so we escape them.
+ * Escape non-ASCII characters since not all systems support them.
*/
protected String escapeNonASCIIs(String str) {
StringBuilder sb = new StringBuilder();
@@ -292,8 +291,7 @@
}
/*
- * Because right now system default charset in JPRT environment is only
- * guaranteed to support ASCII characters in log, so we escape them.
+ * Escape non-ASCII characters since not all systems support them.
*/
protected String escapeNonASCII(char c) {
StringBuilder sb = new StringBuilder();
--- a/test/jdk/java/lang/StringBuffer/CompactStringBuffer.java Tue Oct 02 21:38:54 2018 +0530
+++ b/test/jdk/java/lang/StringBuffer/CompactStringBuffer.java Tue Oct 02 22:36:08 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -471,8 +471,7 @@
}
/*
- * Because right now system default charset in JPRT environment is only
- * guaranteed to support ASCII characters in log, so we escape them.
+ * Escape non-ASCII characters since not all systems support them.
*/
private String escapeNonASCIIs(String str) {
StringBuilder sb = new StringBuilder();
--- a/test/jdk/java/lang/StringBuilder/CompactStringBuilder.java Tue Oct 02 21:38:54 2018 +0530
+++ b/test/jdk/java/lang/StringBuilder/CompactStringBuilder.java Tue Oct 02 22:36:08 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -396,8 +396,7 @@
}
/*
- * Because right now system default charset in JPRT environment is only
- * guaranteed to support ASCII characters in log, so we escape them.
+ * Escape non-ASCII characters since not all systems support them.
*/
private String escapeNonASCIIs(String str) {
StringBuilder sb = new StringBuilder();
--- a/test/jdk/jprt.config Tue Oct 02 21:38:54 2018 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +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/bin:/usr/gnu/bin
-
- # Find GNU make
- make=/usr/bin/gmake
- if [ ! -f ${make} ] ; then
- make=${slashjava}/devtools/${solaris_arch}/bin/gnumake
- 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/jdk/lib/security/CheckBlacklistedCerts.java Tue Oct 02 21:38:54 2018 +0530
+++ b/test/jdk/lib/security/CheckBlacklistedCerts.java Tue Oct 02 22:36:08 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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
@@ -59,8 +59,7 @@
// All certs in the pem files
Set<Certificate> blacklisted = new HashSet<>();
- // Hopefully src comes with test, but it might be missing if doing
- // a -testonly JPRT job.
+ // Assumes the full src is available
File[] blacklists = {
new File(System.getProperty("test.src"),
"../../../make/data/blacklistedcertsconverter/blacklisted.certs.pem"),
--- a/test/jdk/tools/jimage/JImageTest.java Tue Oct 02 21:38:54 2018 +0530
+++ b/test/jdk/tools/jimage/JImageTest.java Tue Oct 02 22:36:08 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -93,9 +93,9 @@
}
File jdkHome = new File(System.getProperty("test.jdk"));
- // JPRT not yet ready for jmods
Helper helper = Helper.newHelper();
if (helper == null) {
+ // Skip test if the jmods directory is missing (e.g. exploded image)
System.err.println("Test not run, NO jmods directory");
return;
}
--- a/test/jdk/tools/jlink/plugins/StringSharingPluginTest.java Tue Oct 02 21:38:54 2018 +0530
+++ b/test/jdk/tools/jlink/plugins/StringSharingPluginTest.java Tue Oct 02 22:36:08 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -67,9 +67,9 @@
private static int strID = 1;
public static void main(String[] args) throws Exception {
- // JPRT not yet ready for jmods
Helper helper = Helper.newHelper();
if (helper == null) {
+ // Skip test if the jmods directory is missing (e.g. exploded image)
System.err.println("Test not run, NO jmods directory");
return;
}
--- a/test/jdk/tools/jlink/plugins/StripDebugPluginTest.java Tue Oct 02 21:38:54 2018 +0530
+++ b/test/jdk/tools/jlink/plugins/StripDebugPluginTest.java Tue Oct 02 22:36:08 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -68,9 +68,9 @@
}
public void test() throws Exception {
- // JPRT not yet ready for jmods
Helper helper = Helper.newHelper();
if (helper == null) {
+ // Skip test if the jmods directory is missing (e.g. exploded image)
System.err.println("Test not run, NO jmods directory");
return;
}
--- a/test/jdk/tools/lib/tests/Helper.java Tue Oct 02 21:38:54 2018 +0530
+++ b/test/jdk/tools/lib/tests/Helper.java Tue Oct 02 22:36:08 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -67,8 +67,8 @@
public static Helper newHelper() throws IOException {
Path jdkHome = Paths.get(System.getProperty("test.jdk"));
- // JPRT not yet ready for jmods
if (!Files.exists(jdkHome.resolve("jmods"))) {
+ // Skip test if the jmods directory is missing (e.g. exploded image)
System.err.println("Test not run, NO jmods directory");
return null;
}
--- a/test/jdk/tools/pack200/Pack200Test.java Tue Oct 02 21:38:54 2018 +0530
+++ b/test/jdk/tools/pack200/Pack200Test.java Tue Oct 02 22:36:08 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -133,7 +133,7 @@
*/
public static void main(String[] args) throws Exception {
// select the jars carefully, adding more jars will increase the
- // testing time, especially for jprt.
+ // testing time.
jarList.add(Utils.createRtJar());
jarList.add(Utils.getGoldenJar());
System.out.println(jarList);
--- a/test/jdk/tools/pack200/TestExceptions.java Tue Oct 02 21:38:54 2018 +0530
+++ b/test/jdk/tools/pack200/TestExceptions.java Tue Oct 02 22:36:08 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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
@@ -110,7 +110,7 @@
ti.checkException(e);
}
}
- } finally { // keep jprt happy
+ } finally { // clean up
for (TestInput ti : tlist) {
if (ti != null) {
ti.close();
@@ -143,7 +143,7 @@
ti.checkException(e);
}
}
- } finally { // keep jprt happy
+ } finally { // clean up
for (PackTestJarInputStream ti : tlist) {
if (ti != null) {
ti.close();
@@ -177,7 +177,7 @@
ti.checkException(e);
}
}
- } finally { // keep jprt happy
+ } finally { // clean up
for (TestInput ti : tlist) {
if (ti != null) {
ti.close();
@@ -210,7 +210,7 @@
ti.checkException(e);
}
}
- } finally { // keep jprt happy
+ } finally { // clean up
for (TestInput ti : tlist) {
if (ti != null) {
ti.close();
--- a/test/langtools/Makefile Tue Oct 02 21:38:54 2018 +0530
+++ b/test/langtools/Makefile Tue Oct 02 22:36:08 2018 -0700
@@ -12,10 +12,6 @@
# build, and set TESTBOOTCLASSPATH to the compiled langtools classes --
# for example build/classes or dist/lib/classes.jar.
-# JPRT
-# JPRT may invoke this Makefile directly, as part of a langtools build,
-# or indirectly, via FOREST/test/Makefile, as part of a control build.
-
# Get OS/ARCH specifics
OSNAME = $(shell uname -s)
ifeq ($(OSNAME), SunOS)
@@ -71,12 +67,6 @@
# Root of this test area (important to use full paths in some places)
TEST_ROOT := $(shell pwd $(CYGPATH) )
-# Default bundle of all test results (passed or not) (JPRT only)
-ifdef JPRT_JOB_ID
- JPRT_CLEAN = clean
- JPRT_ARCHIVE_BUNDLE = $(TEST_ROOT)/JPRT_ARCHIVE_BUNDLE.zip
-endif
-
ifeq ($(PLATFORM), windows)
SLASH_JAVA = J:
else
@@ -85,9 +75,7 @@
# Default JTREG to run
ifndef JTREG_HOME
- ifdef JPRT_JTREG_HOME
- JTREG_HOME = $(JPRT_JTREG_HOME)
- else ifdef JT_HOME
+ ifdef JT_HOME
JTREG_HOME = $(JT_HOME)
else
JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.2/promoted/latest/
@@ -108,11 +96,7 @@
# Default JCK to run
ifndef JCK_HOME
- ifdef JPRT_JCK_HOME
- JCK_HOME = $(JPRT_JCK_HOME)
- else
- JCK_HOME = $(SLASH_JAVA)/re/jck/8/promoted/latest/binaries
- endif
+ JCK_HOME = $(SLASH_JAVA)/re/jck/8/promoted/latest/binaries
endif
# Default JDK for JTREG and JCK
@@ -120,21 +104,13 @@
# JT_JAVA is the version of java used to run jtreg/JCK.
#
ifndef JT_JAVA
- ifdef JPRT_JAVA_HOME
- JT_JAVA = $(JPRT_JAVA_HOME)
- else
- JT_JAVA = $(SLASH_JAVA)/re/jdk/1.9.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
- endif
+ JT_JAVA = $(SLASH_JAVA)/re/jdk/1.9.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
endif
# Default JDK to test
-ifdef JPRT_IMPORT_PRODUCT_HOME
- TESTJAVA = $(JPRT_IMPORT_PRODUCT_HOME)
-else
- TESTJAVA = $(SLASH_JAVA)/re/jdk/1.9.0/promoted/latest/binaries/$(PLATFORM)-$(ARCH)
-endif
+TESTJAVA = $(SLASH_JAVA)/re/jdk/1.9.0/promoted/latest/binaries/$(PLATFORM)-$(ARCH)
-# PRODUCT_HOME is a JPRT variable pointing to a directory containing the output from
+# PRODUCT_HOME is a variable pointing to a directory containing the output from
# make/Makefile
# For langtools, this is a directory containing build and dist
# For a control build, this is build/$(PRODUCT)-$(ARCH)/XYZ-image
@@ -199,12 +175,7 @@
### -jtoptions:-Ejck.env.runtime.testCompile.groupMode.groupSize=$(JCK_GROUP_SIZE)
endif
-# Timeouts -- by default, increase test timeouts when running on JPRT
-ifdef JPRT_JOB_ID
- ifndef JTREG_TIMEOUT_FACTOR
- JTREG_TIMEOUT_FACTOR = 3
- endif
-endif
+# Timeouts
ifdef JTREG_TIMEOUT_FACTOR
JTREG_OPTIONS += -timeoutFactor:$(JTREG_TIMEOUT_FACTOR)
endif
@@ -266,16 +237,16 @@
endif
# Default make rule -- warning, may take a while
-all: $(JPRT_CLEAN) jtreg-tests jck-compiler-tests jck-runtime-tests $(JPRT_ARCHIVE_BUNDLE) all-summary
+all: jtreg-tests jck-compiler-tests jck-runtime-tests all-summary
@echo "Testing completed successfully"
-jtreg apt javac javadoc javah javap jdeps: $(JPRT_CLEAN) jtreg-tests $(JPRT_ARCHIVE_BUNDLE) jtreg-summary
+jtreg apt javac javadoc javah javap jdeps: jtreg-tests jtreg-summary
@echo "Testing completed successfully"
-jck-compiler: $(JPRT_CLEAN) jck-compiler-tests $(JPRT_ARCHIVE_BUNDLE) jck-compiler-summary
+jck-compiler: jck-compiler-tests jck-compiler-summary
@echo "Testing completed successfully"
-jck-runtime: $(JPRT_CLEAN) jck-runtime-tests $(JPRT_ARCHIVE_BUNDLE) jck-runtime-summary
+jck-runtime: jck-runtime-tests jck-runtime-summary
@echo "Testing completed successfully"
# a way to select tests from outside
@@ -286,7 +257,7 @@
JCK_RUNTIME_TESTDIRS = $(TEST_SELECTION)
endif
-# for use with JPRT -testrule
+# convenience targets
all: JTREG_TESTDIRS = .
jtreg: JTREG_TESTDIRS ?= .
apt: JTREG_TESTDIRS = tools/apt
@@ -476,15 +447,8 @@
$(EXIT) 1
fi
-# Bundle up the results
-$(JPRT_ARCHIVE_BUNDLE): FRC
- @rm -f $@
- @mkdir -p $(@D)
- ( cd $(TEST_OUTPUT_DIR) && zip -q -r $@ . )
-
# Cleanup
clean:
- rm -f $(JPRT_ARCHIVE_BUNDLE)
# Used to force a target rules to run
FRC: