Mercurial > hg > truffle

changeset 18245:137f4cf8204a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix AMD64AllocatorTest junit assumption.
author Josef Eisl <josef.eisl@jku.at>
date Tue, 04 Nov 2014 16:51:08 +0100
parents 691e2b53dc63
children 58bbb14d5f49
files graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/AMD64AllocatorTest.java mx/suite.py
diffstat 2 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/AMD64AllocatorTest.java	Wed Jul 30 22:28:09 2014 +0200
+++ b/graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/AMD64AllocatorTest.java	Tue Nov 04 16:51:08 2014 +0100
@@ -22,17 +22,18 @@
  */
 package com.oracle.graal.compiler.amd64.test;
 
+import static org.junit.Assume.*;
+
 import org.junit.*;
 
+import com.oracle.graal.amd64.*;
 import com.oracle.graal.compiler.test.backend.*;
 
-import static org.junit.Assume.*;
-
 public class AMD64AllocatorTest extends AllocatorTest {
 
     @Before
-    public void setUp() {
-        assumeTrue(isArchitecture("x86_64"));
+    public void checkAMD64() {
+        assumeTrue("skipping AMD64 specific test", getTarget().arch instanceof AMD64);
     }
 
     @Test
--- a/mx/suite.py	Wed Jul 30 22:28:09 2014 +0200
+++ b/mx/suite.py	Tue Nov 04 16:51:08 2014 +0100
@@ -761,7 +761,10 @@
     "com.oracle.graal.compiler.amd64.test" : {
       "subDir" : "graal",
       "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.graal.compiler.test"],
+      "dependencies" : [
+        "com.oracle.graal.amd64",
+        "com.oracle.graal.compiler.test",
+      ],
       "checkstyle" : "com.oracle.graal.graph",
       "javaCompliance" : "1.8",
       "workingSets" : "Graal,AMD64,Test",