# HG changeset patch
# User mchung
# Date 1470869665 25200
# Node ID 4c9d829b21eac856d762fe0bde2e7ad09980e5a1
# Parent  274367a99f9871e49c9065b74aa09d308ecc7f1a# Parent  3ad1ad0e7bbab42939e140358489bda5ac8fa891
Merge

diff -r 274367a99f98 -r 4c9d829b21ea langtools/test/ProblemList.txt
--- a/langtools/test/ProblemList.txt	Wed Aug 10 15:47:46 2016 -0700
+++ b/langtools/test/ProblemList.txt	Wed Aug 10 15:54:25 2016 -0700
@@ -54,6 +54,7 @@
 #
 # jshell
 
+jdk/jshell/EditorPadTest.java                                                   8161276    windows-all    Test set-up cannot press buttons
 jdk/jshell/ToolBasicTest.java                                                   8139873    generic-all    JShell tests failing
 
 ###########################################################################
diff -r 274367a99f98 -r 4c9d829b21ea langtools/test/jdk/jshell/EditorTestBase.java
--- a/langtools/test/jdk/jshell/EditorTestBase.java	Wed Aug 10 15:47:46 2016 -0700
+++ b/langtools/test/jdk/jshell/EditorTestBase.java	Wed Aug 10 15:54:25 2016 -0700
@@ -125,7 +125,7 @@
         );
     }
 
-    @Test
+    @Test(enabled = false) // TODO 8163816
     public void testEditClass1() {
         testEditor(
                 a -> assertClass(a, "class A {}", "class", "A"),
@@ -163,7 +163,7 @@
         );
     }
 
-    @Test
+    @Test(enabled = false) // TODO 8163816
     public void testEditMethod1() {
         testEditor(
                 a -> assertMethod(a, "void f() {}", "()void", "f"),
diff -r 274367a99f98 -r 4c9d829b21ea langtools/test/jdk/jshell/ExternalEditorTest.java
--- a/langtools/test/jdk/jshell/ExternalEditorTest.java	Wed Aug 10 15:47:46 2016 -0700
+++ b/langtools/test/jdk/jshell/ExternalEditorTest.java	Wed Aug 10 15:54:25 2016 -0700
@@ -201,7 +201,7 @@
         );
     }
 
-    @Test
+    @Test(enabled = false) // TODO 8159229
     public void testRemoveTempFile() {
         test(new String[]{"-nostartup"},
                 a -> assertCommandCheckOutput(a, "/set editor " + executionScript,