# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1399023227 -7200
# Node ID 4b75c567aa62de98b698bff865c4ee4e8f1c5d57
# Parent  8df78fe6d84c84dd07d05739e13770cb5dbe9b96# Parent  f52961f1527517938da2e1b52c46c81470ba0c60
Merge.

diff -r 8df78fe6d84c -r 4b75c567aa62 graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ArrayListGetTest.java
--- 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();