RFR: JDK-8075586: add @modules as needed to the open hotspot tests

[Mandy Chung]

Alexandar, Shura,

The dependency analysis is not up-to-date that sun.tools.jar
has been moved to jdk.jartool module in jdk9 b55.  It has been
in jdk9/dev since 3/6.
  
I have pointed out multiple times previously that jdk.dev/sun.tools.jar
is wrong in the jdk side of change.

Below includes an example.
Mandy

--- old/test/runtime/RedefineTests/RedefineAnnotations.java	2015-03-25 16:24:41.462038538 +0300
+++ new/test/runtime/RedefineTests/RedefineAnnotations.java	2015-03-25 16:24:41.386038539 +0300
@@ -1,5 +1,5 @@
  /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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,6 +25,9 @@
   * @test
   * @library /testlibrary
   * @summary Test that type annotations are retained after a retransform
+ * @modules java.base/jdk.internal.org.objectweb.asm
+ *          java.instrument
+ *          jdk.dev/sun.tools.jar
   * @run main RedefineAnnotations buildagent
   * @run main/othervm -javaagent:redefineagent.jar RedefineAnnotations
   */


On 3/25/15 7:38 AM, Alexander Kulyakhtin wrote:
> Hi
>
> Please, find the updated review for the bulk @modules change at the link below.
>
> We have fixed the copyrights and the files mentioned in the mail from Lois.
>
> http://cr.openjdk.java.net/~eistepan/~akulyakhtin/8075586/index.html
>
> Best regards,
> Alex
>
>
>
> ----- Original Message -----
> From: lois.foltan at oracle.com
> To: yekaterina.kantserova at oracle.com
> Cc: serviceability-dev at openjdk.java.net, staffan.larsen at oracle.com, hotspot-dev at openjdk.java.net, alexander.kulyakhtin at oracle.com, alexandre.iline at oracle.com
> Sent: Tuesday, March 24, 2015 3:57:54 PM GMT +04:00 Abu Dhabi / Muscat
> Subject: Re: RFR: JDK-8075586: add @modules as needed to the open hotspot tests
>
>
> This looks good, thank you for making these changes!  A couple of
> comments that I don't feel need another webrev but should be fixed
> before pushing.
>
>       - copyrights on all the tests need to be updated
>       - the following tests have a blank comment line before the new
> "@modules" line that could be removed
>         test/gc/metaspace/TestMetaspacePerfCounters.java
>         test/runtime/contended/Basic.java
>         test/compiler/jsr292/CreatesInterfaceDotEqualsCallInfo.java
>         test/compiler/cpuflags/RestoreMXCSR.java
>         test/compiler/debug/VerifyAdapterSharing.java
>
> Thanks,
> Lois
>
> On 3/24/2015 8:09 AM, Yekaterina Kantserova wrote:
>> Notifying hotspot-dev as well.
>>
>> // Katja
>>
>>
>>
>> On 03/24/2015 11:48 AM, Alexander Kulyakhtin wrote:
>>> Could the reviewers, please, have a look at the proposed changes below?
>>>
>>> In addition, we are going to make a change to the TEST.ROOT file as
>>> indicated by Staffan in the mail below.
>>>
>>> Do you think the changes (plus the one-line change to the TEST.ROOT)
>>> can be pushed into the jdk?
>>>
>>> Best regards,
>>> Alex
>>>
>>> ----- Original Message -----
>>> From: staffan.larsen at oracle.com
>>> To: alexander.kulyakhtin at oracle.com
>>> Cc: serviceability-dev at openjdk.java.net, alexandre.iline at oracle.com
>>> Sent: Friday, March 20, 2015 7:39:10 PM GMT +04:00 Abu Dhabi / Muscat
>>> Subject: Re: RFR: JDK-8075586: add @modules as needed to the open
>>> hotspot tests
>>>
>>> I haven’t looked at the changes in detail, but please change the
>>> requiredVersion in TEST.ROOT to 4.1 b11 as part of this change.
>>>
>>> Thanks,
>>> /Staffan
>>>
>>>> On 20 mar 2015, at 13:16, Alexander Kulyakhtin
>>>> <alexander.kulyakhtin at oracle.com> wrote:
>>>>
>>>> Hi,
>>>>
>>>> Could you, please, review the fix below.
>>>>
>>>> CR: https://bugs.openjdk.java.net/browse/JDK-8075586
>>>> webrev:
>>>> http://cr.openjdk.java.net/~tpivovarova/akulyakh/8075586/webrev.00/
>>>>
>>>> The fix adds @modules keyword to the existing hotspot tests, as
>>>> needed, so that the tests can access the required API when the new
>>>> modular architecture is in place.
>>>>
>>>> Best regards,
>>>> Alex

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/serviceability-dev/attachments/20150325/7c52e81d/attachment.html>