Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions TEST.ROOT
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
maxOutputSize=1000000
# there may be tests, whcih absence/presence is quite healthy to be set up in runtime
# those are controlled by environemnt variables. Eg RH_JDK=true will enable few additional tests
# which are known to pass on RH builds, but not on any others
requires.extraPropDefns = tests/VarDeps.java
requires.properties = \
var.rh.jdk
6 changes: 6 additions & 0 deletions test/TEST.ROOT
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
maxOutputSize=1000000
# there may be tests, whcih absence/presence is quite healthy to be set up in runtime
# those are controlled by environemnt variables. Eg RH_JDK=true will enable few additional tests
# which are known to pass on RH builds, but not on any others
requires.extraPropDefns = VarDeps.java
requires.properties = \
var.rh.jdk
27 changes: 27 additions & 0 deletions test/VarDeps.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
import java.util.concurrent.Callable;

public class VarDeps implements Callable<Map<String, String>> {

boolean checkVar(String var) {
String varval = System.getenv(var);
if (varval == null) { return false; }
return varval.equalsIgnoreCase("true");
}

@Override
public Map<String, String> call() {
Map<String, String> map = new HashMap<String, String>();
map.put("var.rh.jdk", checkVar("RH_JDK") ? "true": "false");
return map;
}

public static void main(String[] args) {
for (Map.Entry<String,String> entry: new VarDeps().call().entrySet()) {
System.out.println(entry.getKey() + ": " + entry.getValue());
}
}
}
2 changes: 1 addition & 1 deletion test/reproducers/1112806/GlyphBug4.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/*
* @test
* @bug 1112806
* @requires os.arch != "aarch64"
* @requires os.arch != "aarch64" & (os.family == "linux" | os.family == "windows")
* @summary heck that LineBreakMeasurer.nextLayout does not throw ArrayIndexOutOfBoundsException
* @run main/timeout=60000 GlyphBug4
*/
Expand Down
1 change: 1 addition & 0 deletions test/reproducers/1818881/allowNonCaAnchor-javaSecurity.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

# @test allowNonCaAnchor-javaSecurity
# @requires var.rh.jdk == "true"
# @bug 1818881
# @summary Add security property (i.e. java.security file) version of jdk.security.allowNonCaAnchor
# @run shell allowNonCaAnchor-javaSecurity.sh
Expand Down
1 change: 1 addition & 0 deletions test/reproducers/1818881/allowNonCaAnchor-property.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

# @test jdk.security.allowNonCaAnchor-property
# @requires var.rh.jdk == "true"
# @bug 1818881
# @summary security property jdk.security.allowNonCaAnchor works
# @run shell allowNonCaAnchor-property.sh
Expand Down
1 change: 1 addition & 0 deletions test/reproducers/1894083/test1894083.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/sh

# @test
# @requires var.rh.jdk == "true"
# @bug 1894083
# @summary ojdk was not depending on nss package -> failing in fips mode
# @run shell test1894083.sh
Expand Down
1 change: 1 addition & 0 deletions test/reproducers/1897602/TestDiagnosticCommandImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/*
* Test delegated to shell to make the assert more direct
* test
* requires var.rh.jdk == "true"
* bug 1897602
* summary Warnings when using ManagementFactory.getPlatformMBeanServer with -Xcheck:jni VM argument
* run main/othervm -Xcheck:jni TestDiagnosticCommandImpl
Expand Down
1 change: 1 addition & 0 deletions test/reproducers/1897602/TestDiagnosticCommandImpl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#
# @test
# @requires var.rh.jdk == "true"
# @bug 1897602
# @summary Warnings when using ManagementFactory.getPlatformMBeanServer with -Xcheck:jni VM argument
# @requires jdk.version.major > 8
Expand Down
2 changes: 1 addition & 1 deletion test/reproducers/6913047/Bug6913047.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* @test
* @bug 6913047
* @summary Native memory exhaustion using SunPKCS11 on 32 bits JVM.
* @requires os.simpleArch != "i586"
* @requires os.simpleArch != "i586" & var.rh.jdk == "true"
* @run shell/timeout=120 run.sh
* @author Martin Balao (mbalao@redhat.com)
*/
Expand Down
2 changes: 1 addition & 1 deletion test/reproducers/7057857/MemoryAllocatorTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @modules jdk.jartool/sun.tools.jar
* @bug 6755943 6792554 7057857
* @summary Checks any memory overruns in archive length.
* @requires os.simpleArch != "i586"
* @requires os.simpleArch != "i586" & (os.family == "linux" | os.family == "windows")
* @run main/othervm/timeout=1200 MemoryAllocatorTest
*/

Expand Down