JDK-8180600: make run-test does not work with jib test dependencies

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

JDK-8180600: make run-test does not work with jib test dependencies

Erik Joelsson
The new run-test target does not work with the new jib test dependencies
feature in jdk10-hs. The fix is small, just adding JIB_JAR to the
command line for jtreg if present, as is done in make/TestCommon.gmk.

Bug: https://bugs.openjdk.java.net/browse/JDK-8180600

Patch:

diff -r 91ac8096f365 make/RunTests.gmk
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -358,6 +358,10 @@
      $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
    endif

+  ifneq ($(JIB_JAR), )
+    $1_JTREG_BASIC_OPTIONS += -cpa:$(JIB_JAR)
+  endif
+
    run-test-$1:
      $$(call LogWarn)
      $$(call LogWarn, Running test '$$($1_TEST)')


/Erik

Reply | Threaded
Open this post in threaded view
|

Re: JDK-8180600: make run-test does not work with jib test dependencies

Christian Tornqvist
Hi Erik,

This looks good, thanks for fixing this.

Thanks,
Christian

> On May 18, 2017, at 8:18 AM, Erik Joelsson <[hidden email]> wrote:
>
> The new run-test target does not work with the new jib test dependencies feature in jdk10-hs. The fix is small, just adding JIB_JAR to the command line for jtreg if present, as is done in make/TestCommon.gmk.
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-8180600
>
> Patch:
>
> diff -r 91ac8096f365 make/RunTests.gmk
> --- a/make/RunTests.gmk
> +++ b/make/RunTests.gmk
> @@ -358,6 +358,10 @@
>     $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
>   endif
>
> +  ifneq ($(JIB_JAR), )
> +    $1_JTREG_BASIC_OPTIONS += -cpa:$(JIB_JAR)
> +  endif
> +
>   run-test-$1:
>     $$(call LogWarn)
>     $$(call LogWarn, Running test '$$($1_TEST)')
>
>
> /Erik
>

Reply | Threaded
Open this post in threaded view
|

Re: JDK-8180600: make run-test does not work with jib test dependencies

Erik Joelsson
In reply to this post by Erik Joelsson
Did a slight adjustment, adding double dollars when referencing JIB_JAR
inside a macro body. This makes the code safer in certain cases.

diff -r 91ac8096f365 make/RunTests.gmk
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -358,6 +358,10 @@
      $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
    endif

+  ifneq ($$(JIB_JAR), )
+    $1_JTREG_BASIC_OPTIONS += -cpa:$$(JIB_JAR)
+  endif
+
    run-test-$1:
      $$(call LogWarn)
      $$(call LogWarn, Running test '$$($1_TEST)')


/Erik


On 2017-05-18 14:18, Erik Joelsson wrote:

> The new run-test target does not work with the new jib test
> dependencies feature in jdk10-hs. The fix is small, just adding
> JIB_JAR to the command line for jtreg if present, as is done in
> make/TestCommon.gmk.
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-8180600
>
> Patch:
>
> diff -r 91ac8096f365 make/RunTests.gmk
> --- a/make/RunTests.gmk
> +++ b/make/RunTests.gmk
> @@ -358,6 +358,10 @@
>      $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
>    endif
>
> +  ifneq ($(JIB_JAR), )
> +    $1_JTREG_BASIC_OPTIONS += -cpa:$(JIB_JAR)
> +  endif
> +
>    run-test-$1:
>      $$(call LogWarn)
>      $$(call LogWarn, Running test '$$($1_TEST)')
>
>
> /Erik
>

Reply | Threaded
Open this post in threaded view
|

Re: JDK-8180600: make run-test does not work with jib test dependencies

Magnus Ihse Bursie
In reply to this post by Erik Joelsson
Looks good to me.

/Magnus

On 2017-05-18 14:18, Erik Joelsson wrote:

> The new run-test target does not work with the new jib test
> dependencies feature in jdk10-hs. The fix is small, just adding
> JIB_JAR to the command line for jtreg if present, as is done in
> make/TestCommon.gmk.
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-8180600
>
> Patch:
>
> diff -r 91ac8096f365 make/RunTests.gmk
> --- a/make/RunTests.gmk
> +++ b/make/RunTests.gmk
> @@ -358,6 +358,10 @@
>      $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
>    endif
>
> +  ifneq ($(JIB_JAR), )
> +    $1_JTREG_BASIC_OPTIONS += -cpa:$(JIB_JAR)
> +  endif
> +
>    run-test-$1:
>      $$(call LogWarn)
>      $$(call LogWarn, Running test '$$($1_TEST)')
>
>
> /Erik
>

Reply | Threaded
Open this post in threaded view
|

Re: JDK-8180600: make run-test does not work with jib test dependencies

Magnus Ihse Bursie
In reply to this post by Erik Joelsson
Even better! :)

/Magnus

> 18 maj 2017 kl. 14:26 skrev Erik Joelsson <[hidden email]>:
>
> Did a slight adjustment, adding double dollars when referencing JIB_JAR inside a macro body. This makes the code safer in certain cases.
>
> diff -r 91ac8096f365 make/RunTests.gmk
> --- a/make/RunTests.gmk
> +++ b/make/RunTests.gmk
> @@ -358,6 +358,10 @@
>     $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
>   endif
>
> +  ifneq ($$(JIB_JAR), )
> +    $1_JTREG_BASIC_OPTIONS += -cpa:$$(JIB_JAR)
> +  endif
> +
>   run-test-$1:
>     $$(call LogWarn)
>     $$(call LogWarn, Running test '$$($1_TEST)')
>
>
> /Erik
>
>
>> On 2017-05-18 14:18, Erik Joelsson wrote:
>> The new run-test target does not work with the new jib test dependencies feature in jdk10-hs. The fix is small, just adding JIB_JAR to the command line for jtreg if present, as is done in make/TestCommon.gmk.
>>
>> Bug: https://bugs.openjdk.java.net/browse/JDK-8180600
>>
>> Patch:
>>
>> diff -r 91ac8096f365 make/RunTests.gmk
>> --- a/make/RunTests.gmk
>> +++ b/make/RunTests.gmk
>> @@ -358,6 +358,10 @@
>>     $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
>>   endif
>>
>> +  ifneq ($(JIB_JAR), )
>> +    $1_JTREG_BASIC_OPTIONS += -cpa:$(JIB_JAR)
>> +  endif
>> +
>>   run-test-$1:
>>     $$(call LogWarn)
>>     $$(call LogWarn, Running test '$$($1_TEST)')
>>
>>
>> /Erik
>