OpenJDK / jdk / jdk
changeset 57866:9a36b6a6d502
8236211: [Graal] compiler/graalunit/GraphTest.java is skipped in all testing
Reviewed-by: iignatyev
| author | epavlova |
|---|---|
| date | Wed, 29 Jan 2020 10:12:59 -0800 |
| parents | b986fd6a9173 |
| children | 79fe42b90d9c |
| files | test/hotspot/jtreg/compiler/graalunit/GraphTest.java test/hotspot/jtreg/compiler/graalunit/NodesTest.java test/hotspot/jtreg/compiler/graalunit/TestPackages.txt test/hotspot/jtreg/compiler/graalunit/common/GraalUnitTestLauncher.java |
| diffstat | 4 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/test/hotspot/jtreg/compiler/graalunit/GraphTest.java Wed Jan 29 18:04:53 2020 +0000 +++ b/test/hotspot/jtreg/compiler/graalunit/GraphTest.java Wed Jan 29 10:12:59 2020 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ * @test * @summary * @requires vm.jvmci - * @requires vm.graal.enabled + * * @modules jdk.internal.vm.compiler * * @library /test/lib /compiler/graalunit /
--- a/test/hotspot/jtreg/compiler/graalunit/NodesTest.java Wed Jan 29 18:04:53 2020 +0000 +++ b/test/hotspot/jtreg/compiler/graalunit/NodesTest.java Wed Jan 29 10:12:59 2020 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ * @test * @summary * @requires vm.jvmci - * @requires vm.graal.enabled + * * @modules jdk.internal.vm.compiler * * @library /test/lib /compiler/graalunit /
--- a/test/hotspot/jtreg/compiler/graalunit/TestPackages.txt Wed Jan 29 18:04:53 2020 +0000 +++ b/test/hotspot/jtreg/compiler/graalunit/TestPackages.txt Wed Jan 29 10:12:59 2020 -0800 @@ -10,7 +10,7 @@ CoreAarch64 org.graalvm.compiler.core.aarch64.test CoreJdk9 org.graalvm.compiler.core.jdk9.test Debug org.graalvm.compiler.debug.test -Graph org.graalvm.compiler.graph.test @requires vm.graal.enabled +Graph org.graalvm.compiler.graph.test Hotspot org.graalvm.compiler.hotspot.test HotspotAarch64 org.graalvm.compiler.hotspot.aarch64.test HotspotAmd64 org.graalvm.compiler.hotspot.amd64.test @@ -18,7 +18,7 @@ HotspotSparc org.graalvm.compiler.hotspot.sparc.test @requires vm.simpleArch == "sparcv9" HotspotLir org.graalvm.compiler.hotspot.lir.test Loop org.graalvm.compiler.loop.test -Nodes org.graalvm.compiler.nodes.test @requires vm.graal.enabled +Nodes org.graalvm.compiler.nodes.test Options org.graalvm.compiler.options.test PhasesCommon org.graalvm.compiler.phases.common.test Replacements org.graalvm.compiler.replacements.test
--- a/test/hotspot/jtreg/compiler/graalunit/common/GraalUnitTestLauncher.java Wed Jan 29 18:04:53 2020 +0000 +++ b/test/hotspot/jtreg/compiler/graalunit/common/GraalUnitTestLauncher.java Wed Jan 29 10:12:59 2020 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -234,6 +234,9 @@ javaFlags.addAll(getModuleExports("jdk.internal.vm.compiler", "ALL-UNNAMED")); javaFlags.addAll(getModuleExports("jdk.internal.vm.ci", "ALL-UNNAMED,jdk.internal.vm.compiler")); + // add opens, see JDK-8236211 + javaFlags.add("--add-opens"); + javaFlags.add("jdk.internal.vm.compiler/org.graalvm.graphio=ALL-UNNAMED"); // add VM flags javaFlags.add("-XX:+UnlockExperimentalVMOptions");