Mercurial > hg > graal-compiler
changeset 20936:da2251d7d3c5
Cleanup blacklist for SPARC, add Assume to CompressedNullCheckTest check whether UseCompressedOops is enabled and just check if not running on SPARC on NativeFunctionInterfaceTest
author | Stefan Anzinger <stefan.anzinger@oracle.com> |
---|---|
date | Tue, 14 Apr 2015 17:53:28 +0200 |
parents | 5ad8a163b843 |
children | 37ea76052733 a69a7c0e0ccc |
files | graal/com.oracle.graal.hotspot.amd64.test/src/com/oracle/graal/hotspot/amd64/test/CompressedNullCheckTest.java graal/com.oracle.nfi.test/test/com/oracle/nfi/test/NativeFunctionInterfaceTest.java test/blacklist_sparc.txt |
diffstat | 3 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.amd64.test/src/com/oracle/graal/hotspot/amd64/test/CompressedNullCheckTest.java Tue Apr 14 17:23:57 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64.test/src/com/oracle/graal/hotspot/amd64/test/CompressedNullCheckTest.java Tue Apr 14 17:53:28 2015 +0200 @@ -25,6 +25,7 @@ import org.junit.*; import com.oracle.graal.compiler.test.*; +import com.oracle.graal.hotspot.*; import com.oracle.graal.hotspot.nodes.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; @@ -44,6 +45,7 @@ @Test public void test() { + Assume.assumeTrue(HotSpotGraalRuntime.runtime().getConfig().useCompressedOops); test("testSnippet", new Container()); }
--- a/graal/com.oracle.nfi.test/test/com/oracle/nfi/test/NativeFunctionInterfaceTest.java Tue Apr 14 17:23:57 2015 +0200 +++ b/graal/com.oracle.nfi.test/test/com/oracle/nfi/test/NativeFunctionInterfaceTest.java Tue Apr 14 17:53:28 2015 +0200 @@ -52,6 +52,12 @@ return buf; } + @Before + public void setUp() { + // Ignore on SPARC + Assume.assumeFalse(System.getProperty("os.arch").toUpperCase().contains("SPARC")); + } + @After public void cleanup() { for (long buf : allocations) {
--- a/test/blacklist_sparc.txt Tue Apr 14 17:23:57 2015 +0200 +++ b/test/blacklist_sparc.txt Tue Apr 14 17:53:28 2015 +0200 @@ -1,3 +0,0 @@ -com.oracle.graal.replacements.test.StandardMethodSubstitutionsTest -com.oracle.graal.hotspot.amd64.test.CompressedNullCheckTest -com.oracle.nfi.test.NativeFunctionInterfaceTest