On Mon, 17 Oct 2022 19:22:26 GMT, Alex Menkov <amen...@openjdk.org> wrote:
> The fix resolved conflicts between jvmti test shared code: > test/lib/jdk/test/lib/jvmti/jvmti_common.h and > test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/* to allot NSK tests to use > jvmti_common.h > > testing: test native libraries are built before any test execution, so run > build job should be enough, but for safety I also run > test/hotspot/jtreg/vmTestbase/nsk/jvmti and > test/hotspot/jtreg/serviceability/jvmti This pull request has now been integrated. Changeset: 6240431b Author: Alex Menkov <amen...@openjdk.org> URL: https://git.openjdk.org/jdk/commit/6240431b381cd9327767cec03189aef55e23d8bd Stats: 472 lines in 5 files changed: 47 ins; 418 del; 7 mod 8295697: Resolve conflicts between serviceability/jvmti and nsk/jvmti shared code Reviewed-by: lmesnik, sspitsyn, cjplummer ------------- PR: https://git.openjdk.org/jdk/pull/10733
