Skip to content

Commit 8d41804

Browse files
committed
Avoid running crashing test (GR-68403).
1 parent 39b9269 commit 8d41804

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/memory/ByteArraySupportTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import java.nio.charset.StandardCharsets;
4545

4646
import org.junit.Assert;
47+
import org.junit.Assume;
4748
import org.junit.BeforeClass;
4849
import org.junit.Test;
4950

@@ -55,6 +56,11 @@ public class ByteArraySupportTest {
5556
@BeforeClass
5657
public static void runWithWeakEncapsulationOnly() {
5758
TruffleTestAssumptions.assumeWeakEncapsulation();
59+
60+
// combination currently broken GR-68403
61+
Assume.assumeFalse(TruffleTestAssumptions.isAOT() && TruffleTestAssumptions.isAarch64());
62+
63+
TruffleTestAssumptions.assumeNotAOT();
5864
}
5965

6066
@Test

truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/TruffleTestAssumptions.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,15 @@ public static boolean isExternalIsolate() {
119119
return externalIsolate;
120120
}
121121

122+
public static boolean isLinux() {
123+
return System.getProperty("os.name").toLowerCase().equals("linux");
124+
}
125+
126+
public static boolean isAarch64() {
127+
String osArch = System.getProperty("os.arch").toLowerCase();
128+
return osArch.equals("aarch64") || osArch.equals("arm64"); // some JVMs use arm64
129+
}
130+
122131
public static void assumeAOT() {
123132
Assume.assumeTrue(aot);
124133
}

0 commit comments

Comments
 (0)