-
-
Notifications
You must be signed in to change notification settings - Fork 314
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Java11 updates #483
Merged
+351
−4
Merged
Java11 updates #483
Changes from 14 commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
2793682
For JCK10, temporarily hard reset, if git rebase fails
smlambert 4593a98
Remove extra ending tag
smlambert 423af17
Add git clean step prior to rebase
smlambert 18b07e0
Clean with force
smlambert 8a2bafb
add git stash
smlambert 7d505a6
Try git reset before rebase
smlambert 53e2e07
remove nested echo
smlambert 63e9fe6
Hard reset & Add support for Java11
smlambert 2e9bccb
Add non-version specific files
smlambert ed023b5
Update label
smlambert 1b954d4
Newlines & no nested echo in if
smlambert 6ac13b7
Case-sensitive
smlambert 2e8cf71
Add TEST.ROOT
smlambert dcbcc59
reset for JCK10, fetch/rebase otherwise
smlambert 803600e
More platforms, determine JAVA_VERSION from JVM_VERSION
smlambert ed22b84
Move JAVA_VERSION definition earlier before first use
smlambert cc5a18a
Drop else
smlambert 7cfd718
Wrap method call
smlambert 29bedfb
Support sap
smlambert 1d886ed
Update label for aarch64
smlambert 583acb5
tmp debug
smlambert 0d05968
Temp try
smlambert 2538228
Missing quotes
smlambert 169a675
Merge branch 'java11Updates' of https://github.com/smlambert/openjdk-…
smlambert 49d6686
Drop back to taking param for now
smlambert 02c58d2
Update windows label
smlambert File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
#!groovy | ||
/* Template for test jobs on openjdk8 linux. Configure test job as parameterized. | ||
Set parameter TARGET(openjdk, system, external, perf, jck etc.). | ||
Set UPSTREAM_JOB_NAME(version_build_arch_os, for example: openjdk8_build_x86-64_linux) | ||
Set JVM_VERSION(openjdk8, openjdk8-openj9, openjdk9, openjdk9-openj9, etc.*/ | ||
LABEL='sw.os.linux&&hw.arch.ppcle' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should this be |
||
|
||
node ("master") { | ||
checkout scm | ||
def jenkinsfile = load "${WORKSPACE}/openjdk-tests/buildenv/jenkins/JenkinsfileBase" | ||
jenkinsfile.setLabelParam() | ||
cleanWs() | ||
} | ||
|
||
node("$LABEL") { //ppc64le build use "fedora" too, for now leave as is | ||
PLATFORM = 'ppc64le_linux' | ||
SDK_RESOURCE = 'upstream' | ||
SPEC='linux_ppc-64_cmprssptrs_le' | ||
checkout scm | ||
def jenkinsfile = load "${WORKSPACE}/openjdk-tests/buildenv/jenkins/JenkinsfileBase" | ||
jenkinsfile.testBuild() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
#!groovy | ||
/* Template for test jobs on openjdk8 linux. Configure test job as parameterized. | ||
Set parameter TARGET(openjdk, system, external, perf, jck etc.). | ||
Set UPSTREAM_JOB_NAME(version_build_arch_os, for example: openjdk8_build_x86-64_linux) | ||
Set JVM_VERSION(openjdk8, openjdk8-openj9, openjdk9, openjdk9-openj9, etc.*/ | ||
LABEL='sw.os.linux&&hw.arch.s390x' | ||
|
||
node ("master") { | ||
checkout scm | ||
def jenkinsfile = load "${WORKSPACE}/openjdk-tests/buildenv/jenkins/JenkinsfileBase" | ||
jenkinsfile.setLabelParam() | ||
cleanWs() | ||
} | ||
|
||
node("$LABEL") { | ||
PLATFORM = 's390x_linux' | ||
SDK_RESOURCE = 'upstream' | ||
SPEC='linux_390-64_cmprssptrs' | ||
checkout scm | ||
def jenkinsfile = load "${WORKSPACE}/openjdk-tests/buildenv/jenkins/JenkinsfileBase" | ||
jenkinsfile.testBuild() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
#!groovy | ||
/* Template for test jobs on openjdk8 linux. Configure test job as parameterized. | ||
Set parameter TARGET(openjdk, system, external, perf, jck etc.). | ||
Set UPSTREAM_JOB_NAME(version_build_arch_os, for example: openjdk8_build_x86-64_linux) | ||
Set JVM_VERSION(openjdk8, openjdk8-openj9, openjdk9, openjdk9-openj9, etc.*/ | ||
LABEL='sw.os.linux&&hw.arch.x86' | ||
|
||
node ("master") { | ||
checkout scm | ||
def jenkinsfile = load "${WORKSPACE}/openjdk-tests/buildenv/jenkins/JenkinsfileBase" | ||
jenkinsfile.setLabelParam() | ||
cleanWs() | ||
} | ||
|
||
node("$LABEL") { | ||
PLATFORM = 'x64_linux' | ||
SDK_RESOURCE = 'upstream' | ||
SPEC='linux_x86-64_cmprssptrs' | ||
checkout scm | ||
def jenkinsfile = load "${WORKSPACE}/openjdk-tests/buildenv/jenkins/JenkinsfileBase" | ||
jenkinsfile.testBuild() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
############################################################################ | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
############################################################################ | ||
|
||
# jdk_awt | ||
|
||
############################################################################ | ||
|
||
# jdk_beans | ||
|
||
############################################################################ | ||
|
||
# jdk_lang | ||
|
||
############################################################################ | ||
|
||
# jdk_management | ||
|
||
############################################################################ | ||
|
||
# jdk_jmx | ||
|
||
############################################################################ | ||
|
||
# jdk_math | ||
|
||
java/math/BigInteger/PrimeTest.java 440 linux_arm | ||
|
||
############################################################################ | ||
|
||
# jdk_other | ||
|
||
############################################################################ | ||
|
||
# jdk_net | ||
|
||
############################################################################ | ||
|
||
# jdk_io | ||
|
||
############################################################################ | ||
|
||
# jdk_jdi | ||
|
||
############################################################################ | ||
|
||
# jdk_nio | ||
|
||
############################################################################ | ||
|
||
# jdk_rmi | ||
|
||
############################################################################ | ||
|
||
# jdk_security | ||
|
||
############################################################################ | ||
|
||
# jdk_sound | ||
|
||
############################################################################ | ||
|
||
# jdk_swing | ||
|
||
############################################################################ | ||
|
||
# jdk_text | ||
|
||
############################################################################ | ||
|
||
# jdk_time | ||
|
||
############################################################################ | ||
|
||
# jdk_tools | ||
|
||
############################################################################ | ||
|
||
# jdk_jdi | ||
|
||
############################################################################ | ||
|
||
# jdk_util | ||
|
||
############################################################################ | ||
|
||
# svc_tools | ||
|
||
############################################################################ | ||
|
||
# jdk_other | ||
|
||
############################################################################ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
# This file identifies the root of the test-suite hierarchy. | ||
# It also contains test-suite configuration information. | ||
|
||
# The list of keywords supported in the entire test suite. The | ||
# "intermittent" keyword marks tests known to fail intermittently. | ||
# The "randomness" keyword marks tests using randomness with test | ||
# cases differing from run to run. (A test using a fixed random seed | ||
# would not count as "randomness" by this definition.) Extra care | ||
# should be taken to handle test failures of intermittent or | ||
# randomness tests. | ||
# | ||
# A "headful" test requires a graphical environment to meaningfully | ||
# run. Tests that are not headful are "headless". | ||
# A test flagged with key "printer" requires a printer to succeed, else | ||
# throws a PrinterException or the like. | ||
|
||
keys=2d dnd headful i18n intermittent printer randomness jfr | ||
|
||
# Tests that must run in othervm mode | ||
othervm.dirs=java/awt java/beans javax/accessibility javax/imageio javax/sound javax/swing javax/print \ | ||
com/apple/laf com/sun/java/accessibility com/sun/java/swing sanity/client demo/jfc \ | ||
javax/management com/sun/awt sun/awt sun/java2d javax/xml/jaxp/testng/validation java/lang/ProcessHandle | ||
|
||
# Tests that cannot run concurrently | ||
exclusiveAccess.dirs=java/rmi/Naming java/util/prefs sun/management/jmxremote sun/tools/jstatd sun/security/mscapi java/util/stream java/util/Arrays/largeMemory java/util/BitSet/stream javax/rmi | ||
# Group definitions | ||
groups=TEST.groups | ||
|
||
# Allow querying of various System properties in @requires clauses | ||
# | ||
# Source files for classes that will be used at the beginning of each test suite run, | ||
# to determine additional characteristics of the system for use with the @requires tag. | ||
# Note: compiled bootlibs code will be located in the folder 'bootClasses' | ||
# requires.extraPropDefns = ../../test/jtreg-ext/requires/VMProps.java [../../closed/test/jtreg-ext/requires/VMPropsExt.java] | ||
# requires.extraPropDefns.bootlibs = ../../test/lib/sun ../../test/lib/jdk/test/lib/Platform.java | ||
# requires.extraPropDefns.vmOpts = -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:bootClasses | ||
#requires.properties= \ | ||
# sun.arch.data.model \ | ||
# java.runtime.name \ | ||
# vm.gc.Z \ | ||
# vm.graal.enabled \ | ||
# vm.cds \ | ||
# vm.hasSA \ | ||
# vm.hasSAandCanAttach \ | ||
# docker.support \ | ||
# release.implementor | ||
|
||
# Minimum jtreg version | ||
requiredVersion=4.2 b12 | ||
|
||
# Path to libraries in the topmost test directory. This is needed so @library | ||
# does not need ../../ notation to reach them | ||
external.lib.roots = ../../ | ||
|
||
# Use new module options | ||
useNewOptions=true | ||
|
||
# Use --patch-module instead of -Xmodule: | ||
useNewPatchModule=true |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is comment should be removed as the file is not java version specific anymore.
Same issue in the rest of Jenkins file comments.