Withdrawn: Merge jdk21u
Jiangli Zhou
jiangli at openjdk.org
Thu Aug 1 22:25:59 UTC 2024
On Tue, 30 Jul 2024 19:04:57 GMT, Jiangli Zhou <jiangli at openjdk.org> wrote:
> This PR merges with JDK 21.0.3 (https://github.com/openjdk/jdk/commit/05f18b10620834883180013bb8873a6b4bdc6df2).
>
> Merge was done most automatically. See manual edit and change details below.
>
> **Manual changes:**
> - Edited `.jcheck/conf` and `src/hotspot/share/logging/logTag.hpp` to resolve trivial merge conflicts.
> - Changed `TsanRunner `to use `ProcessTools.createLimitedTestJavaProcessBuilder()` to resolve tsan jtreg test failures. `ProcessTools.createJavaProcessBuilder()` was renamed to `ProcessTools.createLimitedTestJavaProcessBuilder` by https://github.com/openjdk/jdk/pull/15452.
>
> **Merge commands:**
>
> $ git remote add 21u https://github.com/openjdk/jdk21u.git
> $ git remote update
> $ git merge 05f18b1
> #resolve merge conflicts and commit
> $ git remote remove 21u
>
>
> **Testing:**
>
> $ bash configure --with-boot-jdk=/usr/local/google/home/jianglizhou/openjdk/jdk-21.0.1 --with-debug-level=release --disable-warnings-as-errors --with-jtreg=/usr/local/google/home/jianglizhou/github/jtreg/build/images/jtreg --with-stdc++lib=static --disable-precompiled-headers --enable-unlimited-crypto --with-native-debug-symbols=internal --with-default-make-target=jdk-image --disable-warnings-as-errors --with-toolchain-type=clang --disable-warnings-as-errors
>
>
>
> $ make test TEST=hotspot/jtreg/tsan
>
> All tests pass with `release` binary
>
> ==============================
> Test summary
> ==============================
> TEST TOTAL PASS FAIL ERROR
> jtreg:test/hotspot/jtreg/tsan 79 79 0 0
> ==============================
> TEST SUCCESS
This pull request has been closed without being integrated.
-------------
PR: https://git.openjdk.org/tsan/pull/21
More information about the tsan-dev
mailing list