Skip to content
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
merged 26 commits into from
Jul 23, 2018
Merged
Show file tree
Hide file tree
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 Jul 18, 2018
4593a98
Remove extra ending tag
smlambert Jul 18, 2018
423af17
Add git clean step prior to rebase
smlambert Jul 18, 2018
18b07e0
Clean with force
smlambert Jul 18, 2018
8a2bafb
add git stash
smlambert Jul 18, 2018
7d505a6
Try git reset before rebase
smlambert Jul 18, 2018
53e2e07
remove nested echo
smlambert Jul 18, 2018
63e9fe6
Hard reset & Add support for Java11
smlambert Jul 18, 2018
2e9bccb
Add non-version specific files
smlambert Jul 19, 2018
ed023b5
Update label
smlambert Jul 19, 2018
1b954d4
Newlines & no nested echo in if
smlambert Jul 19, 2018
6ac13b7
Case-sensitive
smlambert Jul 19, 2018
2e8cf71
Add TEST.ROOT
smlambert Jul 19, 2018
dcbcc59
reset for JCK10, fetch/rebase otherwise
smlambert Jul 19, 2018
803600e
More platforms, determine JAVA_VERSION from JVM_VERSION
smlambert Jul 20, 2018
ed22b84
Move JAVA_VERSION definition earlier before first use
smlambert Jul 20, 2018
cc5a18a
Drop else
smlambert Jul 20, 2018
7cfd718
Wrap method call
smlambert Jul 20, 2018
29bedfb
Support sap
smlambert Jul 20, 2018
1d886ed
Update label for aarch64
smlambert Jul 20, 2018
583acb5
tmp debug
smlambert Jul 20, 2018
0d05968
Temp try
smlambert Jul 20, 2018
2538228
Missing quotes
smlambert Jul 20, 2018
169a675
Merge branch 'java11Updates' of https://github.com/smlambert/openjdk-…
smlambert Jul 20, 2018
49d6686
Drop back to taking param for now
smlambert Jul 20, 2018
02c58d2
Update windows label
smlambert Jul 23, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion buildenv/jenkins/JenkinsfileBase
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,14 @@ def setupEnv() {
env.JAVA_BIN = "$WORKSPACE/openjdkbinary/j2sdk-image/${(JAVA_VERSION == 'SE80') ? 'jre/' : ''}bin"
env.JRE_IMAGE = "$WORKSPACE/openjdkbinary/j2jre-image"
env.JAVA_HOME = "${JAVA_BIN}/.."
env.JAVA_VERSION = "${JAVA_VERSION}"
env.JVM_VERSION = "${JVM_VERSION}"
env.SPEC = "${SPEC}"

if( params.JAVA_VERSION ) {
env.JAVA_VERSION = params.JAVA_VERSION
} else {
env.JAVA_VERSION = "${JAVA_VERSION}"
}

if( params.BUILD_LIST ) {
env.BUILD_LIST = params.BUILD_LIST
Expand Down
22 changes: 22 additions & 0 deletions buildenv/jenkins/openjdk_ppc64le_linux
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.
Copy link
Contributor

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.

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'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be sw.os.linux&&hw.arch.ppc64le?


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()
}
22 changes: 22 additions & 0 deletions buildenv/jenkins/openjdk_s390x_linux
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()
}
22 changes: 22 additions & 0 deletions buildenv/jenkins/openjdk_x86-64_linux
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()
}
16 changes: 14 additions & 2 deletions jck/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,27 @@
<!-- jck materials exist, update jck materials if needed-->
<else>
<echo message="${env.JCK_ROOT}/${env.JCK_VERSION} exists, try to update jck materials" />
<echo message="git fetch ${env.JCK_GIT_REPO}" />
<if>
<equals arg1="jck10" arg2="${env.JCK_VERSION}" />
<then>
<exec executable="git" failonerror="true">
<arg value="reset" />
<arg value="--hard" />
<arg value="origin/master" />
</exec>
</then>
<else>

<exec executable="git" dir="${env.JCK_ROOT}/${env.JCK_VERSION}" failonerror="true">
<arg value="fetch" />
</exec>
<echo message="git rebase origin/master" />

<exec executable="git" dir="${env.JCK_ROOT}/${env.JCK_VERSION}" failonerror="true">
<arg value="rebase" />
<arg value="origin/master" />
</exec>
</else>
</if>
</else>
</if>
</target>
Expand Down
103 changes: 103 additions & 0 deletions openjdk_regression/ProblemList_openjdk11-openj9.txt
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

############################################################################
3 changes: 3 additions & 0 deletions openjdk_regression/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
<condition property="openjdkGit" value="openjdk-jdk10u">
<equals arg1="${JAVA_VERSION}" arg2="SE100"/>
</condition>
<condition property="openjdkGit" value="openjdk-jdk11">
<equals arg1="${JAVA_VERSION}" arg2="SE110"/>
</condition>

<target name="getJtreg">
<mkdir dir="${DEST}"/>
Expand Down
59 changes: 59 additions & 0 deletions openjdk_regression/openjdk11-openj9/TEST.ROOT
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
Loading