Skip to content

8271707: migrate tests to use jdk.test.whitebox.WhiteBox #1434

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 2 commits into from
Closed

8271707: migrate tests to use jdk.test.whitebox.WhiteBox #1434

wants to merge 2 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jun 14, 2023 •
edited by openjdk bot
Loading

I backport this for parity with 17.0.8-oracle.

I had to resolve a row of files, also quite some test are just not in 17.
I grepped through the tests and fixed all remaining occurances, too.

Here the files I resolved:
test/hotspot/jtreg/compiler/allocation/TestFailedAllocationBadGraph.java
Already fixed.

test/hotspot/jtreg/compiler/c2/irTests/TestSuperwordFailsUnrolling.java
Fixed.

Tests not in 17, patch skipped:
test/hotspot/jtreg/compiler/ciReplay/TestDumpReplayCommandLine.java
test/hotspot/jtreg/compiler/ciReplay/TestInlining.java
test/hotspot/jtreg/compiler/ciReplay/TestLambdas.java
test/hotspot/jtreg/compiler/ciReplay/TestNoClassFile.java
test/hotspot/jtreg/compiler/ciReplay/TestUnresolvedClasses.java
test/hotspot/jtreg/compiler/jvmci/compilerToVM/IterateFramesNative.java
test/hotspot/jtreg/compiler/rangechecks/TestLongRangeCheck.java
test/hotspot/jtreg/compiler/regalloc/TestC2IntPressure.java
test/hotspot/jtreg/compiler/vectorization/runner/ArrayCopyTest.java
test/hotspot/jtreg/compiler/vectorization/runner/ArrayIndexFillTest.java
test/hotspot/jtreg/compiler/vectorization/runner/ArrayInvariantFillTest.java
test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java
test/hotspot/jtreg/compiler/vectorization/runner/ArrayTypeConvertTest.java
test/hotspot/jtreg/compiler/vectorization/runner/ArrayUnsafeOpTest.java
test/hotspot/jtreg/compiler/vectorization/runner/BasicBooleanOpTest.java
test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java
test/hotspot/jtreg/compiler/vectorization/runner/BasicCharOpTest.java
test/hotspot/jtreg/compiler/vectorization/runner/BasicDoubleOpTest.java
test/hotspot/jtreg/compiler/vectorization/runner/BasicFloatOpTest.java
test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java
test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java
test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
test/hotspot/jtreg/compiler/vectorization/runner/LoopArrayIndexComputeTest.java
test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java
test/hotspot/jtreg/compiler/vectorization/runner/LoopControlFlowTest.java
test/hotspot/jtreg/compiler/vectorization/runner/LoopLiveOutNodesTest.java
test/hotspot/jtreg/compiler/vectorization/runner/LoopRangeStrideTest.java
test/hotspot/jtreg/compiler/vectorization/runner/LoopReductionOpTest.java
test/hotspot/jtreg/compiler/vectorization/runner/MultipleLoopsTest.java
test/hotspot/jtreg/compiler/vectorization/runner/StripMinedLoopTest.java
test/hotspot/jtreg/compiler/vectorization/runner/VectorizationTestRunner.java

test/hotspot/jtreg/gc/TestReferenceClearDuringReferenceProcessing.java
Fixed already

test/hotspot/jtreg/gc/arguments/TestSmallInitialHeapWithLargePageAndNUMA.java
Resolved

test/hotspot/jtreg/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java
Does not use Whitebox in 17. Skipped.

Tests not in 17, patch skipped:
test/hotspot/jtreg/gc/g1/TestEvacuationFailure.java

test/hotspot/jtreg/gc/g1/TestGCLogMessages.java
Does not use Whitebox in 17. Skipped.

test/hotspot/jtreg/gc/g1/TestNoEagerReclaimOfHumongousRegions.java
Resolved.

test/hotspot/jtreg/gc/g1/TestSkipRebuildRemsetPhase.java
Resolved.

test/hotspot/jtreg/gc/g1/numa/TestG1NUMATouchRegions.java
Resolved.

Tests not in 17, patch skipped:
test/hotspot/jtreg/runtime/ClassUnload/UnloadTestWithVerifyDuringGC.java

test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
Does not use Whitebox in 17. Skipped.

test/hotspot/jtreg/runtime/cds/DumpSymbolAndStringTable.java
Does not use Whitebox in 17. Skipped.

test/hotspot/jtreg/runtime/cds/SharedStringsWb.java
Copyright

test/hotspot/jtreg/runtime/cds/appcds/cacheObject/GCStressApp.java
Copyright

test/hotspot/jtreg/runtime/cds/appcds/cacheObject/RedefineClassApp.java
Copyright

test/hotspot/jtreg/runtime/cds/appcds/customLoader/HelloCustom.java
Resolved

test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java
Resolve.

test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/OldClassApp.java
Resolved.

test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java
Resolved.

Tests not in 17, patch skipped:
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DumpToDefaultArchive.java
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DuplicatedCustomTest.java
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicSharedSymbols.java
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/LambdaForOldInfInBaseArchive.java
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/LotsUnloadTest.java
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ModulePath.java
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/NestHostOldInf.java
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/OldClassInBaseArchive.java
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/RedefineCallerClassTest.java
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchive.java
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestLambdaInvokers.java
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/DuplicatedCustomApp.java

test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDumpWb.java
Copyright.

test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestDynamicDump.java
Resolved.

test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestFileSafety.java
Resolved.

test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestStaticDump.java
Resolved.

test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_Shared.java
Resolved.

test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/HelloStringGC.java
Copyright.

test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/HelloStringPlus.java
Copyright.

test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternStringTest.java
Copyright.

test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LockStringTest.java
Copyright.

test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LockStringValueTest.java
Copyright.

test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWb.java
Copyright.

test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClassesForSubgraphs.java
Resolved.

test/hotspot/jtreg/runtime/handshake/HandshakeDirectTest.java
Does not use Whitebox, skipped.

test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCompLevels.java
Resolved.

test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestControls.java
Resolved.

test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java
Resolved.

test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java
Resolved.

test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002a.java
Resolved

test/jdk/java/foreign/stackwalk/TestAsyncStackWalk.java
Resolved.

test/jdk/java/foreign/stackwalk/TestStackWalk.java
Resolved

Tests not in 17, patch skipped:
test/jdk/java/foreign/upcalldeopt/TestUpcallDeopt.java

test/jdk/java/lang/ref/CleanerTest.java
Resolved.

Tests not in 17, patch skipped:
test/jdk/jdk/internal/vm/Continuation/Fuzz.java
test/jdk/jdk/jfr/api/consumer/TestRecordedFrameType.java
test/lib/jdk/test/lib/cds/CDSArchiveUtils.java

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8271707: migrate tests to use jdk.test.whitebox.WhiteBox (Enhancement - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/1434/head:pull/1434
$ git checkout pull/1434

Update a local copy of the PR:
$ git checkout pull/1434
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/1434/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1434

View PR using the GUI difftool:
$ git pr show -t 1434

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1434.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 14, 2023

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@GoeLin GoeLin changed the title Goetz backport 8271707 Backport e7795851d2e02389e63950fef939084b18ec4bfb Jun 14, 2023
@openjdk openjdk bot changed the title Backport e7795851d2e02389e63950fef939084b18ec4bfb 8271707: migrate tests to use jdk.test.whitebox.WhiteBox Jun 14, 2023
@openjdk
Copy link

openjdk bot commented Jun 14, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jun 14, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 14, 2023

Webrevs

TheRealMDoerr
TheRealMDoerr approved these changes Jun 15, 2023
View reviewed changes
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

LGTM. Huge change, but complexity is not very high. Thanks for the detailed description and for splitting backport and new adaptations into 2 commits.

test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java
@@ -54,7 +54,7 @@ public static void main(String[] args) throws Exception {
customJar = JarBuilder.build("SameNameInTwoLoadersTest_custom", "CustomLoadee", "CustomLoadee3");

useWbParam = "-Xbootclasspath/a:" +
JarBuilder.build(true, "WhiteBox", "sun/hotspot/WhiteBox");;
JarBuilder.build(true, "WhiteBox", "jdk/test/whitebox/WhiteBox");;
Copy link
Contributor

Choose a reason for hiding this comment

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

New code has only one ';'. Feel free to remove one (accept new code). Not required.

@openjdk
Copy link

openjdk bot commented Jun 15, 2023

@GoeLin This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8271707: migrate tests to use jdk.test.whitebox.WhiteBox

Reviewed-by: mdoerr

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 12 new commits pushed to the master branch:

  • f9a6075: 8302150: Speed up compiler/codegen/Test7100757.java
  • 954bbaa: 8282651: ZGC: vmTestbase/gc/ArrayJuggle/ tests fails intermittently with exit code 97
  • 30d0484: 8299962: Speed up compiler/intrinsics/unsafe/DirectByteBufferTest.java and HeapByteBufferTest.java
  • 31a7fd3: 8298921: Create a regression test for JDK-8139581
  • faafe22: 8305858: Resolve multiple definition of 'handleSocketError' when statically linking with JDK native libraries
  • 01ac9cb: 8309138: Fix container tests for jdks with symlinked conf dir
  • 6991372: 8305995: Footprint regression from JDK-8224957
  • 2570e72: 8308300: enhance exceptions in MappedMemoryUtils.c
  • ebb9a36: 8309297: Adjust ShenandoahHeap print_heap_regions_on
  • 8ac9c57: Merge
  • ... and 2 more: https://git.openjdk.org/jdk17u-dev/compare/12d08f0cabefc6b23690b7c3676ffdfb7388a779...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 15, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jun 16, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jun 16, 2023

Going to push as commit 2bed865.
Since your change was applied there have been 13 commits pushed to the master branch:

  • eed854c: 8309340: Provide sctpHandleSocketErrorWithMessage
  • f9a6075: 8302150: Speed up compiler/codegen/Test7100757.java
  • 954bbaa: 8282651: ZGC: vmTestbase/gc/ArrayJuggle/ tests fails intermittently with exit code 97
  • 30d0484: 8299962: Speed up compiler/intrinsics/unsafe/DirectByteBufferTest.java and HeapByteBufferTest.java
  • 31a7fd3: 8298921: Create a regression test for JDK-8139581
  • faafe22: 8305858: Resolve multiple definition of 'handleSocketError' when statically linking with JDK native libraries
  • 01ac9cb: 8309138: Fix container tests for jdks with symlinked conf dir
  • 6991372: 8305995: Footprint regression from JDK-8224957
  • 2570e72: 8308300: enhance exceptions in MappedMemoryUtils.c
  • ebb9a36: 8309297: Adjust ShenandoahHeap print_heap_regions_on
  • ... and 3 more: https://git.openjdk.org/jdk17u-dev/compare/12d08f0cabefc6b23690b7c3676ffdfb7388a779...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 16, 2023
@openjdk openjdk bot closed this Jun 16, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 16, 2023
@openjdk
Copy link

openjdk bot commented Jun 16, 2023

@GoeLin Pushed as commit 2bed865.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@GoeLin GoeLin deleted the goetz_backport_8271707 branch June 16, 2023 11:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheRealMDoerr TheRealMDoerr TheRealMDoerr approved these changes

Assignees
No one assigned
Labels
backport integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@GoeLin @TheRealMDoerr