Merge branch 'dragonwell-project:master' into codecacheTest

.github/actions/get-jtreg/action.yml

@@ -41,7 +41,7 @@ runs:
 
  - name: 'Check cache for JTReg'
  id: get-cached-jtreg
- uses: actions/cache@v3
+ uses: actions/cache@v4
  with:
  path: jtreg/installed
  key: jtreg-${{ steps.version.outputs.value }}
@@ -57,9 +57,12 @@ runs:
  - name: 'Build JTReg'
  run: |
  # Build JTReg and move files to the proper locations
- jdkPath="$(which java)"
- javaHome=${jdkPath%%'/bin'*}
- bash make/build.sh --jdk "$javaHome"
+ if [ -n "$JAVA_HOME_11_X64" ]; then
+ jdk=$JAVA_HOME_11_X64
+ else
+ jdk=$(dirname $(dirname $(readlink -f `which java`)))
+ fi
+ bash make/build.sh --jdk "$jdk"
  mkdir ../installed
  mv build/images/jtreg/* ../installed
  working-directory: jtreg/src

.github/workflows/build-linux.yml

@@ -69,7 +69,6 @@ jobs:
  build-linux:
  name: build
  runs-on: ${{fromJson(inputs.runs-on)}}
- #runs-on: 'ubuntu-20.04'
 
  strategy:
  fail-fast: false
@@ -118,6 +117,7 @@ jobs:
  fi
  sudo apt-get install -y gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} libxrandr-dev${{ steps.arch.outputs.suffix }} libxtst-dev${{ steps.arch.outputs.suffix }} libcups2-dev${{ steps.arch.outputs.suffix }} libasound2-dev${{ steps.arch.outputs.suffix }} ${{ inputs.apt-extra-packages }} $extra_packages
  sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }}
+ if: inputs.platform != 'linux-aarch64'
 
  - name: 'Configure'
  run: >

.github/workflows/build-riscv.yml

@@ -61,9 +61,7 @@ on:
 jobs:
  build-linux:
  name: build
- runs-on: [self-hosted , X64]
- container:
- image: docker.io/alibabadragonwelljdk/centos7_gcc7_build_image:latest
+ runs-on: ubuntu-20.04
 
  strategy:
  fail-fast: false
@@ -74,6 +72,19 @@ jobs:
  - name: 'Checkout the JDK source'
  uses: actions/checkout@v2
 
+ - name: 'Install Boot JDK'
+ run: |
+ wget https://dragonwell.oss-cn-shanghai.aliyuncs.com/11.0.23.20.9/Alibaba_Dragonwell_Extended_11.0.23.20.9_x64_linux.tar.gz -O jdk.tar.gz
+ mkdir -p /usr/lib/jvm/jdk-11
+ tar zxvf jdk.tar.gz -C /usr/lib/jvm/jdk-11 --strip-components=1
+ rm -rf jdk.tar.gz
+
+ - name: 'Install riscv64 toolchain'
+ run: |
+ wget https://compiler-tools.oss-cn-hangzhou.aliyuncs.com/riscv64-build/riscv_opt.tar.gz -O riscv_opt.tar.gz
+ tar zxvf riscv_opt.tar.gz -C /opt/
+ rm -rf riscv_opt.tar.gz
+
  - name: 'Configure'
  run: >
  LD_LIBRARY_PATH=/opt/riscv_toolchain_linux/lib64
@@ -88,7 +99,7 @@ jobs:
  --without-version-pre
  --with-version-build=9
  --with-version-patch=14
- --with-boot-jdk=/usr/lib/jvm/jdk-10
+ --with-boot-jdk=/usr/lib/jvm/jdk-11
  --with-native-debug-symbols=external
  --with-jvm-variants=server
  --disable-warnings-as-errors

.github/workflows/main.yml

@@ -35,9 +35,7 @@ on:
  platforms:
  description: 'Platform(s) to execute on (comma separated, e.g. "linux-x64, macos, aarch64")'
  required: true
- #default: 'linux-x64, linux-cross-compile, windows-x64'
- #default: 'linux-x64, linux-aarch64'
- default: 'linux aarch64'
+ default: 'linux-x64, linux-aarch64, linux-cross-compile, windows-x64'
  configure-arguments:
  description: 'Additional configure arguments'
  required: false

.gitignore

@@ -1,6 +1,7 @@
 /build/
 /dist/
 /.idea/
+/.vscode/
 nbproject/private/
 /webrev
 /.src-rev
@@ -15,3 +16,4 @@ NashornProfile.txt
 **/JTwork/**
 /compile_commands.json
 /.cache
+*.swp

.jcheck/conf

@@ -1,7 +1,7 @@
 [general]
 project=jdk-updates
 jbs=JDK
-version=11.0.23
+version=11.0.24
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace

doc/testing.html

@@ -5,7 +5,7 @@
  <meta name="generator" content="pandoc" />
  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
  <title>Testing the JDK</title>
- <style type="text/css">
+ <style>
  code{white-space: pre-wrap;}
  span.smallcaps{font-variant: small-caps;}
  span.underline{text-decoration: underline;}
@@ -21,7 +21,7 @@
 <header id="title-block-header">
 <h1 class="title">Testing the JDK</h1>
 </header>
-<nav id="TOC">
+<nav id="TOC" role="doc-toc">
 <ul>
 <li><a href="#using-the-run-test-framework">Using the run-test framework</a><ul>
 <li><a href="#configuration">Configuration</a></li>
@@ -40,6 +40,7 @@ <h1 class="title">Testing the JDK</h1>
 <li><a href="#notes-for-specific-tests">Notes for Specific Tests</a><ul>
 <li><a href="#docker-tests">Docker Tests</a></li>
 <li><a href="#client-ui-tests">Client UI Tests</a></li>
+<li><a href="#pkcs11-tests">PKCS11 Tests</a></li>
 </ul></li>
 </ul>
 </nav>
@@ -58,7 +59,7 @@ <h3 id="configuration">Configuration</h3>
 <p>To be able to run JTReg tests, <code>configure</code> needs to know where to find the JTReg test framework. If it is not picked up automatically by configure, use the <code>--with-jtreg=&lt;path to jtreg home&gt;</code> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc. (An alternative is to set the <code>JT_HOME</code> environment variable to point to the JTReg home before running <code>configure</code>.)</p>
 <h2 id="test-selection">Test selection</h2>
 <p>All functionality is available using the run-test make target. In this use case, the test or tests to be executed is controlled using the <code>TEST</code> variable. To speed up subsequent test runs with no source code changes, run-test-only can be used instead, which do not depend on the source and test image build.</p>
-<p>For some common top-level tests, direct make targets have been generated. This includes all JTReg test groups, the hotspot gtest, and custom tests (if present). This means that <code>make run-test-tier1</code> is equivalent to <code>make run-test TEST=&quot;tier1&quot;</code>, but the latter is more tab-completion friendly. For more complex test runs, the <code>run-test TEST=&quot;x&quot;</code> solution needs to be used.</p>
+<p>For some common top-level tests, direct make targets have been generated. This includes all JTReg test groups, the hotspot gtest, and custom tests (if present). This means that <code>make run-test-tier1</code> is equivalent to <code>make run-test TEST="tier1"</code>, but the latter is more tab-completion friendly. For more complex test runs, the <code>run-test TEST="x"</code> solution needs to be used.</p>
 <p>The test specifications given in <code>TEST</code> is parsed into fully qualified test descriptors, which clearly and unambigously show which tests will be run. As an example, <code>:tier1</code> will expand to <code>jtreg:$(TOPDIR)/test/hotspot/jtreg:tier1 jtreg:$(TOPDIR)/test/jdk:tier1 jtreg:$(TOPDIR)/test/langtools:tier1 jtreg:$(TOPDIR)/test/nashorn:tier1 jtreg:$(TOPDIR)/test/jaxp:tier1</code>. You can always submit a list of fully qualified test descriptors in the <code>TEST</code> variable if you want to shortcut the parser.</p>
 <h3 id="common-test-groups">Common Test Groups</h3>
 <p>Ideally, all tests are run for every change but this may not be practical due to the limited testing resources, the scope of the change, etc.</p>
@@ -101,8 +102,8 @@ <h2 id="test-results-and-summary">Test results and summary</h2>
 <p>Additional work data is stored in <code>build/$BUILD/test-support/$TEST_ID</code>. For some frameworks, this directory might contain information that is useful in determining the cause of a failed test.</p>
 <h2 id="test-suite-control">Test suite control</h2>
 <p>It is possible to control various aspects of the test suites using make control variables.</p>
-<p>These variables use a keyword=value approach to allow multiple values to be set. So, for instance, <code>JTREG=&quot;JOBS=1;TIMEOUT=8&quot;</code> will set the JTReg concurrency level to 1 and the timeout factor to 8. This is equivalent to setting <code>JTREG_JOBS=1 JTREG_TIMEOUT=8</code>, but using the keyword format means that the <code>JTREG</code> variable is parsed and verified for correctness, so <code>JTREG=&quot;TMIEOUT=8&quot;</code> would give an error, while <code>JTREG_TMIEOUT=8</code> would just pass unnoticed.</p>
-<p>To separate multiple keyword=value pairs, use <code>;</code> (semicolon). Since the shell normally eats <code>;</code>, the recommended usage is to write the assignment inside qoutes, e.g. <code>JTREG=&quot;...;...&quot;</code>. This will also make sure spaces are preserved, as in <code>JTREG=&quot;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;</code>.</p>
+<p>These variables use a keyword=value approach to allow multiple values to be set. So, for instance, <code>JTREG="JOBS=1;TIMEOUT=8"</code> will set the JTReg concurrency level to 1 and the timeout factor to 8. This is equivalent to setting <code>JTREG_JOBS=1 JTREG_TIMEOUT=8</code>, but using the keyword format means that the <code>JTREG</code> variable is parsed and verified for correctness, so <code>JTREG="TMIEOUT=8"</code> would give an error, while <code>JTREG_TMIEOUT=8</code> would just pass unnoticed.</p>
+<p>To separate multiple keyword=value pairs, use <code>;</code> (semicolon). Since the shell normally eats <code>;</code>, the recommended usage is to write the assignment inside qoutes, e.g. <code>JTREG="...;..."</code>. This will also make sure spaces are preserved, as in <code>JTREG="VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"</code>.</p>
 <p>(Other ways are possible, e.g. using backslash: <code>JTREG=JOBS=1\;TIMEOUT=8</code>. Also, as a special technique, the string <code>%20</code> will be replaced with space for certain options, e.g. <code>JTREG=VM_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug</code>. This can be useful if you have layers of scripts and have trouble getting proper quoting of command line arguments through.)</p>
 <p>As far as possible, the names of the keywords have been standardized between test suites.</p>
 <h3 id="general-keywords-test_opts">General keywords (TEST_OPTS)</h3>
@@ -152,7 +153,7 @@ <h4 id="run_problem_lists">RUN_PROBLEM_LISTS</h4>
 <p>Set to <code>true</code> or <code>false</code>. If <code>true</code>, JTReg will use <code>-match:</code> option, otherwise <code>-exclude:</code> will be used. Default is <code>false</code>.</p>
 <h4 id="options">OPTIONS</h4>
 <p>Additional options to the JTReg test framework.</p>
-<p>Use <code>JTREG=&quot;OPTIONS=--help all&quot;</code> to see all available JTReg options.</p>
+<p>Use <code>JTREG="OPTIONS=--help all"</code> to see all available JTReg options.</p>
 <h4 id="java_options-1">JAVA_OPTIONS</h4>
 <p>Additional Java options to JTReg (<code>-javaoption</code>).</p>
 <h4 id="vm_options-1">VM_OPTIONS</h4>
@@ -169,7 +170,7 @@ <h4 id="repeat">REPEAT</h4>
 <p>Default is 1. Set to -1 to repeat indefinitely. This can be especially useful combined with <code>OPTIONS=--gtest_break_on_failure</code> to reproduce an intermittent problem.</p>
 <h4 id="options-1">OPTIONS</h4>
 <p>Additional options to the Gtest test framework.</p>
-<p>Use <code>GTEST=&quot;OPTIONS=--help&quot;</code> to see all available Gtest options.</p>
+<p>Use <code>GTEST="OPTIONS=--help"</code> to see all available Gtest options.</p>
 <h4 id="aot_modules-2">AOT_MODULES</h4>
 <p>Generate AOT modules before testing for the specified module, or set of modules. If multiple modules are specified, they should be separated by space (or, to help avoid quoting issues, the special value <code>%20</code>).</p>
 <h2 id="notes-for-specific-tests">Notes for Specific Tests</h2>
@@ -178,6 +179,11 @@ <h3 id="docker-tests">Docker Tests</h3>
 <pre><code>$ make run-test TEST=&quot;jtreg:test/hotspot/jtreg/containers/docker&quot;</code></pre>
 <p>To run these tests correctly, additional parameters for the correct docker image are required on Ubuntu 18.04 by using <code>JAVA_OPTIONS</code>.</p>
 <pre><code>$ make run-test TEST=&quot;jtreg:test/hotspot/jtreg/containers/docker&quot; JTREG=&quot;JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest&quot;</code></pre>
+<h3 id="pkcs11-tests">PKCS11 Tests</h3>
+<p>It is highly recommended to use the latest NSS version when running PKCS11 tests. Improper NSS version may lead to unexpected failures which are hard to diagnose. For example, sun/security/pkcs11/Secmod/AddTrustedCert.java may fail on Ubuntu 18.04 with the default NSS version in the system. To run these tests correctly, the system property <<code>jdk.test.lib.artifacts.&lt;NAME&gt;</code> is required on Ubuntu 18.04 to specify the alternative NSS lib directories.The<code>&lt;NAME&gt;</code> component should be replaced with the name element of the appropriate <code>@Artifact</code> class. (See<code>test/jdk/sun/security/pkcs11/PKCS11Test.java</code>)</p>
+<p>For example:</p>
+<pre><code>$ make test TEST=&quot;jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java&quot; JTREG=&quot;JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs&quot</code></pre>
+<p>For more notes about the PKCS11 tests, please refer to test/jdk/sun/security/pkcs11/README.</p>
 <h3 id="client-ui-tests">Client UI Tests</h3>
 <p>Some Client UI tests use key sequences which may be reserved by the operating system. Usually that causes the test failure. So it is highly recommended to disable system key shortcuts prior testing. The steps to access and disable system key shortcuts for various platforms are provided below.</p>
 <h4 id="macos">MacOS</h4>

doc/testing.md

@@ -370,6 +370,22 @@ required on Ubuntu 18.04 by using `JAVA_OPTIONS`.
 
  $ make run-test TEST="jtreg:test/hotspot/jtreg/containers/docker" JTREG="JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest"
 
+### PKCS11 Tests
+
+It is highly recommended to use the latest NSS version when running PKCS11 tests.
+Improper NSS version may lead to unexpected failures which are hard to diagnose.
+For example, sun/security/pkcs11/Secmod/AddTrustedCert.java may fail on Ubuntu
+18.04 with the default NSS version in the system.
+To run these tests correctly, the system property `jdk.test.lib.artifacts.<NAME>` is required on
+Ubuntu 18.04 to specify the alternative NSS lib directory. The `<NAME>`
+component should be replaced with the name element of the appropriate
+`@Artifact` class. (See `test/jdk/sun/security/pkcs11/PKCS11Test.java`)
+For example:
+
+ $ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" JTREG="JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs"
+
+For more notes about the PKCS11 tests, please refer to test/jdk/sun/security/pkcs11/README.
+
 ### Client UI Tests
 
 Some Client UI tests use key sequences which may be reserved by the operating

make.sh

@@ -6,7 +6,7 @@ if [ $# != 1 ]; then
 fi
 
 # incr by every Dragonwell release
-DRAGONWELL_VERSION=20
+DRAGONWELL_VERSION=21
 LC_ALL=C
 BUILD_MODE=$1
 arch=$(uname -m)

make/Main.gmk

@@ -554,6 +554,18 @@ test-image-jdk-jtreg-native:
  +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNativeJdk.gmk \
  test-image-jdk-jtreg-native)
 
+# Native files needed by the testlib
+build-test-lib-native:
+ +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f BuildTestLibNative.gmk \
+ build-test-lib-native)
+
+test-image-lib-native:
+ +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f BuildTestLibNative.gmk \
+ test-image-lib-native)
+
+# Native files needed when testing the testlib itself
+# ... build-test-libtest-jtreg-native etc not yet backported
+
 build-test-hotspot-jtreg-graal:
  +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregGraalUnit.gmk \
  build-test-hotspot-jtreg-graal)
@@ -596,7 +608,8 @@ endif
 
 ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \
  test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \
- test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \
+ test-image-jdk-jtreg-native build-test-lib-native test-image-lib-native \
+ build-test-lib build-test-failure-handler \
  test-failure-handler test-image-failure-handler test-image-hotspot-gtest \
  test-image-hotspot-jtreg-graal build-test-hotspot-jtreg-graal \
  run-test exploded-run-test
@@ -976,12 +989,16 @@ else
 
  build-test-jdk-jtreg-native: buildtools-jdk java.base-libs
 
+ build-test-lib-native: buildtools-jdk java.base-libs
+
  build-test-hotspot-jtreg-graal: exploded-image-optimize
 
  test-image-hotspot-jtreg-native: build-test-hotspot-jtreg-native
 
  test-image-jdk-jtreg-native: build-test-jdk-jtreg-native
 
+ test-image-lib-native: build-test-lib-native
+
  test-image-hotspot-jtreg-graal: build-test-hotspot-jtreg-graal
 
  test-image-hotspot-gtest: hotspot
@@ -1141,7 +1158,8 @@ endif
 
 # This target builds the test image
 test-image: prepare-test-image \
- test-image-jdk-jtreg-native test-image-failure-handler \
+ test-image-jdk-jtreg-native test-image-lib-native \
+ test-image-failure-handler \
  test-image-demos-jdk $(JVM_TEST_IMAGE_TARGETS)
 
 ################################################################################

make/autoconf/configure.ac

@@ -183,15 +183,14 @@ TOOLCHAIN_POST_DETECTION
 TOOLCHAIN_SETUP_BUILD_COMPILERS
 TOOLCHAIN_MISC_CHECKS
 
-# Setup the JTReg Regression Test Harness.
-TOOLCHAIN_SETUP_JTREG
-
-# Setup Jib dependency tool
-TOOLCHAIN_SETUP_JIB
-
 # After toolchain setup, we need to process some flags to be able to continue.
 FLAGS_POST_TOOLCHAIN
 
+# Setup the tools needed to test the JDK (JTReg Regression Test Harness
+# and the Jib dependency tool).
+LIB_TESTS_SETUP_JTREG
+LIB_TESTS_SETUP_JIB
+
 # Now we can test some aspects on the target using configure macros.
 PLATFORM_SETUP_OPENJDK_TARGET_BITS
 PLATFORM_SETUP_OPENJDK_TARGET_ENDIANNESS
@@ -233,7 +232,8 @@ HOTSPOT_SETUP_JVM_FEATURES
 ###############################################################################
 
 JDKOPT_DETECT_INTREE_EC
-JDKOPT_ENABLE_DISABLE_FAILURE_HANDLER
+LIB_TESTS_ENABLE_DISABLE_FAILURE_HANDLER
+
 JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST
 JDKOPT_EXCLUDE_TRANSLATIONS
 JDKOPT_ENABLE_DISABLE_MANPAGES