changeset 15466:4b75c567aa62

Merge.
author Roland Schatz <roland.schatz@oracle.com>
date Fri, 02 May 2014 11:33:47 +0200
parents 8df78fe6d84c (current diff) f52961f15275 (diff)
children 4e3c2247daf4
files
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ArrayListGetTest.java	Fri May 02 09:12:23 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ArrayListGetTest.java	Fri May 02 11:33:47 2014 +0200
@@ -25,12 +25,12 @@
 
 import static com.oracle.graal.debug.Debug.*;
 
-import com.oracle.graal.compiler.hsail.test.infra.GraalKernelTester;
-import com.oracle.graal.debug.*;
+import java.util.*;
 
-import org.junit.Test;
+import org.junit.*;
 
-import java.util.ArrayList;
+import com.oracle.graal.compiler.hsail.test.infra.*;
+import com.oracle.graal.debug.*;
 
 /**
  * Tests calling ArrayList.get().
@@ -60,6 +60,7 @@
 
     // NYI emitForeignCall charAlignedDisjointArraycopy
     @Test(expected = com.oracle.graal.compiler.common.GraalInternalError.class)
+    @Ignore
     public void testUsingLambdaMethod() {
         try (DebugConfigScope s = disableIntercept()) {
             testGeneratedHsailUsingLambdaMethod();