From 75367071703f1137f94cd1635159fac6dafc4d76 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 7 Mar 2024 10:10:23 +0100 Subject: [PATCH] Returned msys2 with targetted excludes --- .github/workflows/test.yaml | 39 ++++++++++++++++++- TEST.ROOT | 3 +- test/TEST.ROOT | 3 +- test/VarDeps.java | 1 + .../cgroup-memory-limit-respected-systemd.sh | 2 +- .../1582253/KeytoolNotGenerateDSA.sh | 1 + .../1759335/keytool-broken-fips.sh | 1 + .../1780335/fips-load-p11-kit-trust.sh | 2 +- test/reproducers/2036462/Test.java | 1 + test/reproducers/6656625/Test.java | 1 + test/reproducers/6657133/Test.java | 1 + test/reproducers/6804996/Test.java | 1 + test/reproducers/6804998/Test.java | 1 + test/reproducers/6823373/Test.java | 1 + test/reproducers/7013969/Test7013969.java | 1 + test/reproducers/7046823/bug7046823.java | 2 +- test/reproducers/7122141/Main.java | 1 + 17 files changed, 55 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index b069779..becc14b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -82,8 +82,8 @@ jobs: with: path: "test.*.tar.gz" - test-windows: - name: "Windows Jtreg" + test-windows-cygwin: + name: "Windows-cygwin Jtreg" runs-on: "windows-latest" defaults: run: @@ -129,3 +129,38 @@ jobs: uses: actions/upload-artifact@v3 with: path: "test.*.tar.gz" + + test-windows-msys2: + name: "Windows-msys2 Jtreg" + runs-on: "windows-latest" + strategy: + fail-fast: false + matrix: + jdkconf: + - JDK 8 + - JDK 11 + - JDK 17 + - JDK 21 + include: + - jdkconf: JDK 8 + jdkver: "8" + - jdkconf: JDK 11 + jdkver: "11" + - jdkconf: JDK 17 + jdkver: "17" + - jdkconf: JDK 21 + jdkver: "21" + steps: + - uses: actions/checkout@v3 + - uses: msys2/setup-msys2@v2 + with: + update: true + install: wget tar + - name: Prepare env + shell: msys2 {0} + run: MSYS2_ENABLED=true ./run.sh "${JAVA_HOME}" + - name: Upload results + if: ${{ always() }} + uses: actions/upload-artifact@v3 + with: + path: "test.*.tar.gz" diff --git a/TEST.ROOT b/TEST.ROOT index 3280f7a..13994e9 100644 --- a/TEST.ROOT +++ b/TEST.ROOT @@ -4,4 +4,5 @@ maxOutputSize=1000000 # which are known to pass on RH builds, but not on any others requires.extraPropDefns = tests/VarDeps.java requires.properties = \ - var.rh.jdk + var.rh.jdk \ + var.msys2.enabled diff --git a/test/TEST.ROOT b/test/TEST.ROOT index 5dd4073..fb9acf2 100644 --- a/test/TEST.ROOT +++ b/test/TEST.ROOT @@ -4,4 +4,5 @@ maxOutputSize=1000000 # which are known to pass on RH builds, but not on any others requires.extraPropDefns = VarDeps.java requires.properties = \ - var.rh.jdk + var.rh.jdk \ + var.msys2.enabled diff --git a/test/VarDeps.java b/test/VarDeps.java index 6a9e3b2..2bae275 100644 --- a/test/VarDeps.java +++ b/test/VarDeps.java @@ -16,6 +16,7 @@ boolean checkVar(String var) { public Map call() { Map map = new HashMap(); map.put("var.rh.jdk", checkVar("RH_JDK") ? "true": "false"); + map.put("var.msys2.enabled", checkVar("MSYS2_ENABLED") ? "true": "false"); return map; } diff --git a/test/reproducers/1463098/cgroup-memory-limit-respected-systemd.sh b/test/reproducers/1463098/cgroup-memory-limit-respected-systemd.sh index 3590f6f..79ac3b8 100644 --- a/test/reproducers/1463098/cgroup-memory-limit-respected-systemd.sh +++ b/test/reproducers/1463098/cgroup-memory-limit-respected-systemd.sh @@ -1,7 +1,7 @@ #!/bin/sh # @test -# @requires jdk.version.major >= 7 # @bug 1463098 +# @requires jdk.version.major >= 7 & var.msys2.enabled == "false" # @summary cgroup memory limit not respected when run outside container # @run shell/timeout=120 cgroup-memory-limit-respected-systemd.sh diff --git a/test/reproducers/1582253/KeytoolNotGenerateDSA.sh b/test/reproducers/1582253/KeytoolNotGenerateDSA.sh index 28dfa2c..9c8a7b7 100644 --- a/test/reproducers/1582253/KeytoolNotGenerateDSA.sh +++ b/test/reproducers/1582253/KeytoolNotGenerateDSA.sh @@ -1,6 +1,7 @@ #!/bin/sh # @test # @bug 1582253 +# @requires var.msys2.enabled == "false" # @summary Do not generate DSA keys by default in keytool # @run shell/timeout=100 KeytoolNotGenerateDSA.sh diff --git a/test/reproducers/1759335/keytool-broken-fips.sh b/test/reproducers/1759335/keytool-broken-fips.sh index 606d815..12f75e3 100755 --- a/test/reproducers/1759335/keytool-broken-fips.sh +++ b/test/reproducers/1759335/keytool-broken-fips.sh @@ -1,6 +1,7 @@ #!/bin/sh # @test # @bug 1759335 +# @requires var.msys2.enabled == "false" # @summary OpenJDK keytool is broken in FIPS mode # @run shell keytool-broken-fips.sh diff --git a/test/reproducers/1780335/fips-load-p11-kit-trust.sh b/test/reproducers/1780335/fips-load-p11-kit-trust.sh index 6163699..221633b 100644 --- a/test/reproducers/1780335/fips-load-p11-kit-trust.sh +++ b/test/reproducers/1780335/fips-load-p11-kit-trust.sh @@ -3,7 +3,7 @@ # @test # @author zzambers # @bug 1780335 -# @requires jdk.version.major >= 8 +# @requires jdk.version.major >= 8 & var.msys2.enabled == "false" # @summary FIPS mode Provider refuses to load pk11-kit-trust # @run shell fips-load-p11-kit-trust.sh # diff --git a/test/reproducers/2036462/Test.java b/test/reproducers/2036462/Test.java index 84a5401..ed86fb1 100644 --- a/test/reproducers/2036462/Test.java +++ b/test/reproducers/2036462/Test.java @@ -2,6 +2,7 @@ /* @test runtest @bug 2036462 + @requires var.msys2.enabled == "false" @summary test whether this Test.java file is buildable as is @run shell runtest.sh */ diff --git a/test/reproducers/6656625/Test.java b/test/reproducers/6656625/Test.java index 51df814..29e5aea 100644 --- a/test/reproducers/6656625/Test.java +++ b/test/reproducers/6656625/Test.java @@ -8,6 +8,7 @@ /* @test @bug 6656625 + @requires var.msys2.enabled == "false" @summary image stream manipulation @run shell Test.sh */ diff --git a/test/reproducers/6657133/Test.java b/test/reproducers/6657133/Test.java index 97bbe7f..9bf78e1 100644 --- a/test/reproducers/6657133/Test.java +++ b/test/reproducers/6657133/Test.java @@ -5,6 +5,7 @@ public /* @test @bug 6657133 + @requires var.msys2.enabled == "false" @summary inaccessibile com.sun.imageio.plugins.jpeg.JPEG.names @run shell Test.sh */ diff --git a/test/reproducers/6804996/Test.java b/test/reproducers/6804996/Test.java index e28cfc8..d900228 100644 --- a/test/reproducers/6804996/Test.java +++ b/test/reproducers/6804996/Test.java @@ -1,5 +1,6 @@ /* @test @bug 6804996 + @requires var.msys2.enabled == "false" @summary some splash issue @run shell Test.sh */ diff --git a/test/reproducers/6804998/Test.java b/test/reproducers/6804998/Test.java index 13410c6..544ffc8 100644 --- a/test/reproducers/6804998/Test.java +++ b/test/reproducers/6804998/Test.java @@ -5,6 +5,7 @@ /* @test @bug 6804998 + @requires var.msys2.enabled == "false" @summary invalid gif read issue @run shell Test.sh */ diff --git a/test/reproducers/6823373/Test.java b/test/reproducers/6823373/Test.java index 83d338b..afaa4be 100644 --- a/test/reproducers/6823373/Test.java +++ b/test/reproducers/6823373/Test.java @@ -1,5 +1,6 @@ /* @test @bug 6823373 + @requires var.msys2.enabled == "false" @summary some splash issue @run shell Test.sh */ diff --git a/test/reproducers/7013969/Test7013969.java b/test/reproducers/7013969/Test7013969.java index 722944a..31a0c9a 100644 --- a/test/reproducers/7013969/Test7013969.java +++ b/test/reproducers/7013969/Test7013969.java @@ -8,6 +8,7 @@ /* * @test * @bug 7013969 + * @requires var.msys2.enabled == "false" * @summary network interface address scan * @run shell 7013969.sh */ diff --git a/test/reproducers/7046823/bug7046823.java b/test/reproducers/7046823/bug7046823.java index e154412..927b163 100644 --- a/test/reproducers/7046823/bug7046823.java +++ b/test/reproducers/7046823/bug7046823.java @@ -3,7 +3,7 @@ @bug 7046823 @summary Problem with scripting/javascript @build bug7046823 - @requires jdk.version.major < 9 + @requires jdk.version.major < 9 & var.msys2.enabled == "false" @run shell bug7046823.sh */ diff --git a/test/reproducers/7122141/Main.java b/test/reproducers/7122141/Main.java index 5d99f8b..af26e66 100644 --- a/test/reproducers/7122141/Main.java +++ b/test/reproducers/7122141/Main.java @@ -2,6 +2,7 @@ /* * @test * @bug 7122141 + * @requires var.msys2.enabled == "false" * @summary race condition between isAnnotationPresent and getAnnotations * @author Lukas Zachar * @run shell runtest.sh