I've updated my patch per the latest jtreg changes. Tested this with the
latest code synced from the jtreg repository, seems like shell tests do get run
(but don't pass, tests will need to be changed).
Thanks,
-Andrew
-----Original Message-----
From: Jonathan Gibbons <[email protected]>
Sent: Wednesday, January 9, 2019 1:39 PM
To: Erik Joelsson <[email protected]>; Andrew Luo
<[email protected]>; [email protected]
Subject: Re: [PATCH] Fixes for running tests on WSL
Erik,
I have pushed a version of Andrew's patch for jtreg into the jtreg repo.
With regard to Andrew's proposed patch for make/RunTests.gmk, the name of the
option to use for jtreg is now just "-wsl'.
-- Jon
On 01/07/2019 01:10 AM, Erik Joelsson wrote:
> Hello Andrew,
>
> If the patch gets accepted to Jtreg, this looks good. We will need to
> wait for Jtreg support before pushing this though.
>
> /Erik
>
> On 2019-01-06 20:34, Andrew Luo wrote:
>> Hi Everyone,
>>
>> I've gotten shell tests to run on WSL with some changes to jtreg and
>> a small change to the OpenJDK gmake files. Most of them are still
>> not passing (I believe one or two of them did just work out of the
>> box after these changes as failures + error count dropped; previous
>> errors + previous failures < current failures; also "errors" dropped
>> to zero), as the scripts themselves will need to be changed, however,
>> at least now they can actually run... My patch with proposed changes
>> are attached.
>>
>> I've sent the corresponding jtreg changes to the code-tools-dev
>> mailing list:
>> https://mail.openjdk.java.net/pipermail/code-tools-dev/2019-January/0
>> 00464.html
>>
>> Let me know if you have any feedback/comments.
>>
>> Thanks,
>>
>> -Andrew
>>
>>
diff --git a/make/RunTests.gmk b/make/RunTests.gmk
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, 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
@@ -814,6 +814,10 @@
$1_JTREG_BASIC_OPTIONS += -e:_NT_SYMBOL_PATH
endif
+ ifeq ($$(OPENJDK_BUILD_OS_ENV), windows.wsl)
+ $1_JTREG_BASIC_OPTIONS += -wsl
+ endif
+
$1_JTREG_BASIC_OPTIONS += \
$$(addprefix -javaoption:, $$(JTREG_JAVA_OPTIONS)) \
$$(addprefix -vmoption:, $$(JTREG_VM_OPTIONS)) \
