Skip to content
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

win-x86 test suites #456

Merged
merged 21 commits into from
Jun 18, 2024
Merged

win-x86 test suites #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4c27c03
Add tests for win-x86
wasabii Dec 6, 2023
554e8bc
Map to Windows2022 image.
wasabii Dec 6, 2023
4014f43
Update IKVM.yml
wasabii Dec 7, 2023
4cb06ff
Update IKVM.yml
wasabii Dec 7, 2023
1a43352
Add dotnet for x86
wasabii Dec 7, 2023
eeb9050
Merge branch 'main' into x86
wasabii Dec 7, 2023
88fe3c9
Different option name.
wasabii Dec 8, 2023
4fbf346
Try -a again.
wasabii Dec 8, 2023
ff92507
Don't install x64 if on x86.
wasabii Dec 8, 2023
55d3513
Try to set x86 path#
wasabii Dec 9, 2023
b67f243
Try env variables?
wasabii Dec 9, 2023
326a3a4
Merge branch 'main' into x86
wasabii Feb 6, 2024
77dcc68
Merge develop.
wasabii Feb 11, 2024
dd11ab7
DIsable some shell scripts on win-x86. No WSL available.
wasabii Feb 11, 2024
55b9e15
Merge develop.
wasabii Mar 11, 2024
5eed30c
Merge branch 'develop' into x86
wasabii Mar 11, 2024
80644f4
Merge branch 'develop' into x86
wasabii Mar 12, 2024
ead29aa
Merge branch 'x86' of https://github.com/ikvmnet/ikvm into x86
wasabii Mar 12, 2024
f2210b4
Merge branch 'develop' into x86
wasabii Jun 16, 2024
ecec1a2
Add test.
wasabii Jun 16, 2024
b2daaa4
We allocate too much memory here for 32 bit.
wasabii Jun 17, 2024
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
39 changes: 38 additions & 1 deletion .github/workflows/IKVM.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,11 +506,20 @@ jobs:
}
}

$include = @(
@{
"run" = "IKVM.Tests"
"tfm" = "net8.0"
"sys" = "win-x86"
}
)

"matrix=" + (@{
sys = $sys
tfm = $tfm
run = $run
exclude = $exclude
include = $include
} | ConvertTo-Json -Compress).Replace('"', "'") >> $env:GITHUB_OUTPUT
test:
needs:
Expand All @@ -521,7 +530,7 @@ jobs:
matrix: ${{ fromJSON(needs.test-vars.outputs.matrix) }}
name: Test (${{ matrix.run }}:${{ matrix.tfm }}:${{ matrix.sys }})
timeout-minutes: 240
runs-on: ${{ fromJSON('{"win-x64":["windows-2022"],"linux-x64":["ubuntu-22.04"],"osx-x64":["macos-12"]}')[matrix.sys] }}
runs-on: ${{ fromJSON('{"win-x86":["windows-2022"],"win-x64":["windows-2022"],"linux-x64":["ubuntu-22.04"],"osx-x64":["macos-12"]}')[matrix.sys] }}
steps:
- name: Free Disk Space (Linux)
if: runner.os == 'Linux'
Expand Down Expand Up @@ -563,17 +572,41 @@ jobs:
shell: pwsh
run: choco install vcredist-all -y
- name: Setup .NET 6.0
if: matrix.sys != 'win-x86'
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
- name: Setup .NET 7.0
if: matrix.sys != 'win-x86'
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
- name: Setup .NET 8.0
if: matrix.sys != 'win-x86'
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
- name: Setup .NET 6.0
if: matrix.sys == 'win-x86'
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
env:
PROCESSOR_ARCHITECTURE: x86
- name: Setup .NET 7.0
if: matrix.sys == 'win-x86'
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
env:
PROCESSOR_ARCHITECTURE: x86
- name: Setup .NET 8.0
if: matrix.sys == 'win-x86'
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
env:
PROCESSOR_ARCHITECTURE: x86
- name: Setup WSL
if: runner.os == 'Windows'
uses: Vampire/setup-wsl@v3
Expand Down Expand Up @@ -643,6 +676,10 @@ jobs:
"--logger:trx"
# "--collect", "Code Coverage"
)

if ($sys -eq "win-x86") {
$argl += @("-a", "x86")
}

$runsettings = $(gi .\tests\$tst\$tfm\*.runsettings)
if ($runsettings) {
Expand Down
4 changes: 4 additions & 0 deletions src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1396,6 +1396,7 @@ java/net/URLClassLoader/closetest/GetResourceAsStream.java
java/net/URLClassLoader/getresourceasstream/test.sh generic-all
java/net/URLClassLoader/sealing/CheckSealed.java generic-all
java/net/URLConnection/UNCTest.sh generic-all
java/net/URLConnection/6212146/test.sh windows-i586
java/net/URLPermission/OpenURL.java generic-all
java/net/URLPermission/nstest/lookup.sh generic-all
java/nio/Buffer/Chew.java generic-all
Expand Down Expand Up @@ -3245,6 +3246,7 @@ sun/net/sdp/sanity.sh

sun/net/www/protocol/http/RetryUponTimeout.java linux-all
sun/nio/cs/TestCompoundTest.java linux-all
sun/nio/cs/Test4200310.sh windows-i586

sun/nio/ch/SelProvider.java linux-all,macosx-all

Expand Down Expand Up @@ -3280,6 +3282,7 @@ sun/security/pkcs11/KeyGenerator/DESParity.java
sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java generic-all
sun/security/pkcs11/KeyPairGenerator/TestDH2048.java generic-all
sun/security/pkcs11/KeyStore/SecretKeysBasic.sh generic-all
sun/security/pkcs11/KeyStore/Basic.sh windows-i586
sun/security/pkcs11/Mac/ReinitMac.java generic-all
sun/security/pkcs11/Mac/MacKAT.java generic-all
sun/security/pkcs11/Mac/MacSameTest.java generic-all
Expand Down Expand Up @@ -3324,6 +3327,7 @@ sun/security/pkcs11/tls/TestLeadingZeroesP11.java
sun/security/pkcs11/tls/TestMasterSecret.java generic-all
sun/security/pkcs11/tls/TestPRF.java generic-all
sun/security/pkcs11/tls/TestPremaster.java generic-all
sun/security/pkcs11/KeyStore/Solaris.sh windows-i586

# points NativePRNG at a specific file: our implementations don't support this
sun/security/provider/SecureRandom/StrongSeedReader.java generic-all
Expand Down
6 changes: 5 additions & 1 deletion src/IKVM.Tests/Java/java/nio/channels/AsynchronousFileChannelTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,10 @@ public void ShouldThrowAsynchronousCloseExceptionWhenClosedDuringWrite()
[TestMethod]
public void CanCancelDuringWrite()
{
// we allocate too much memory here
if (Environment.Is64BitProcess == false)
return;

var rng = RandomNumberGenerator.Create();
var rnd = new System.Random();

Expand Down Expand Up @@ -595,4 +599,4 @@ public void CanCancelDuringWrite()

}

}
}
Loading