Skip to content

Support testing with JDK 17 #1108

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

Closed
jonpryor wants to merge 6 commits into from
Closed

Support testing with JDK 17 #1108

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80b391d
Support testing with JDK 17
jonpryor May 10, 2023
5c4bfff
Fix unit test failures
jonpryor May 11, 2023
d07d9f2
JDK 17 requires a new gradle (?!)
jonpryor May 12, 2023
a2e2df5
Fix jnimarshalmethodgen
jonpryor May 12, 2023
30c41f9
set JAVA_HOME=$(Java8SdkDirectory)
jonpryor May 12, 2023
cb29a4b
Fix `make run-tests`
jonpryor May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix make run-tests 
`<SetEnvironmentVariable/>` was failing because `JI_JVM_PATH` was
being set to an empty string.
  • Loading branch information
@jonpryor
jonpryor committed May 13, 2023
commit cb29a4bd729722e5a9301d22785095ada225af2f
6 changes: 3 additions & 3 deletions build-tools/scripts/RunNUnitTests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<_Run Condition=" '$(RUN)' != '' ">--run=&quot;$(RUN)&quot;</_Run>
</PropertyGroup>
<Import
Condition=" Exists('..\..\bin\Build$(Configuration)\JdkInfo.props') "
Project="..\..\bin\Build$(Configuration)\JdkInfo.props"
Condition=" Exists('..\..\bin\Build$(Configuration)\JdkInfo-11.props') "
Project="..\..\bin\Build$(Configuration)\JdkInfo-11.props"
/>
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\Java.Interop.BootstrapTasks.dll" TaskName="Java.Interop.BootstrapTasks.SetEnvironmentVariable" />
<ItemGroup>
Expand All @@ -27,7 +27,7 @@
<SetEnvironmentVariable Name="MONO_TRACE_LISTENER" Value="Console.Out" />
<SetEnvironmentVariable Name="JAVA_INTEROP_GREF_LOG" Value="bin\Test$(Configuration)\g-%(_TestAssembly.Filename).txt" />
<SetEnvironmentVariable Name="JAVA_INTEROP_LREF_LOG" Value="bin\Test$(Configuration)\l-%(_TestAssembly.Filename).txt" />
<SetEnvironmentVariable Name="JI_JVM_PATH" Value="$(JdkJvmPath)" />
<SetEnvironmentVariable Name="JI_JVM_PATH" Value="$(JdkJvm11Path)" />
<Exec
Command="$(_NUnit) $(NUNIT_EXTRA) %(_TestAssembly.Identity) $(_Run) --result=&quot;TestResult-%(Filename).xml&quot; --output=&quot;bin\Test$(Configuration)\TestOutput-%(Filename).txt&quot;"
WorkingDirectory="$(_TopDir)"
Expand Down