# HG changeset patch
# User darcy
# Date 1525538041 25200
# Node ID e2dc18484400a6be911468de1ae9f926a3ba120b
# Parent  3ba0d8631f24d95f77b5145b26e74ea3fc1b7133
8202599: Mark intermittently failing jshell tests
Reviewed-by: rfield

diff -r 3ba0d8631f24 -r e2dc18484400 test/langtools/TEST.groups
--- a/test/langtools/TEST.groups	Sat May 05 09:24:29 2018 -0700
+++ b/test/langtools/TEST.groups	Sat May 05 09:34:01 2018 -0700
@@ -38,6 +38,7 @@
     -jdk/jshell/ToolBasicTest.java \
     -jdk/jshell/ToolLocaleMessageTest.java \
     -jdk/jshell/ToolReloadTest.java \
+    -jdk/jshell/UserInputTest.java \
     -jdk/jshell/UserJdiUserRemoteTest.java
 
 # (Almost) no langtools tests are tier 2.
@@ -53,6 +54,7 @@
     jdk/jshell/ToolBasicTest.java \
     jdk/jshell/ToolLocaleMessageTest.java \
     jdk/jshell/ToolReloadTest.java \
+    jdk/jshell/UserInputTest.java \
     jdk/jshell/UserJdiUserRemoteTest.java
 
 # No langtools tests are tier 3 either.
diff -r 3ba0d8631f24 -r e2dc18484400 test/langtools/jdk/jshell/FailOverDirectExecutionControlTest.java
--- a/test/langtools/jdk/jshell/FailOverDirectExecutionControlTest.java	Sat May 05 09:24:29 2018 -0700
+++ b/test/langtools/jdk/jshell/FailOverDirectExecutionControlTest.java	Sat May 05 09:34:01 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@
  * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask
  * @build KullaTesting ExecutionControlTestBase Compiler
  * @run testng FailOverDirectExecutionControlTest
+ * @key intermittent
  */
 
 import java.nio.file.Path;
diff -r 3ba0d8631f24 -r e2dc18484400 test/langtools/jdk/jshell/FailOverExecutionControlDyingLaunchTest.java
--- a/test/langtools/jdk/jshell/FailOverExecutionControlDyingLaunchTest.java	Sat May 05 09:24:29 2018 -0700
+++ b/test/langtools/jdk/jshell/FailOverExecutionControlDyingLaunchTest.java	Sat May 05 09:34:01 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  *          jdk.jshell/jdk.jshell.spi
  * @build KullaTesting ExecutionControlTestBase DyingRemoteAgent
  * @run testng FailOverExecutionControlDyingLaunchTest
+ * @key intermittent
  */
 
 import org.testng.annotations.Test;
diff -r 3ba0d8631f24 -r e2dc18484400 test/langtools/jdk/jshell/FailOverExecutionControlHangingListenTest.java
--- a/test/langtools/jdk/jshell/FailOverExecutionControlHangingListenTest.java	Sat May 05 09:24:29 2018 -0700
+++ b/test/langtools/jdk/jshell/FailOverExecutionControlHangingListenTest.java	Sat May 05 09:34:01 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  *          jdk.jshell/jdk.jshell.spi
  * @build KullaTesting ExecutionControlTestBase
  * @run testng FailOverExecutionControlHangingListenTest
+ * @key intermittent
  */
 
 import java.net.InetAddress;
diff -r 3ba0d8631f24 -r e2dc18484400 test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java
--- a/test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java	Sat May 05 09:24:29 2018 -0700
+++ b/test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java	Sat May 05 09:34:01 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @modules jdk.jshell/jdk.jshell jdk.jshell/jdk.jshell.spi jdk.jshell/jdk.jshell.execution
  * @build HangingRemoteAgent
  * @run testng JdiHangingListenExecutionControlTest
+ * @key intermittent
  */
 
 import org.testng.annotations.Test;
diff -r 3ba0d8631f24 -r e2dc18484400 test/langtools/jdk/jshell/JdiLaunchingExecutionControlTest.java
--- a/test/langtools/jdk/jshell/JdiLaunchingExecutionControlTest.java	Sat May 05 09:24:29 2018 -0700
+++ b/test/langtools/jdk/jshell/JdiLaunchingExecutionControlTest.java	Sat May 05 09:34:01 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @modules jdk.jshell/jdk.jshell.execution
  * @build KullaTesting ExecutionControlTestBase
  * @run testng JdiLaunchingExecutionControlTest
+ * @key intermittent
  */
 
 
diff -r 3ba0d8631f24 -r e2dc18484400 test/langtools/jdk/jshell/JdiListeningExecutionControlTest.java
--- a/test/langtools/jdk/jshell/JdiListeningExecutionControlTest.java	Sat May 05 09:24:29 2018 -0700
+++ b/test/langtools/jdk/jshell/JdiListeningExecutionControlTest.java	Sat May 05 09:34:01 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @modules jdk.jshell/jdk.jshell.execution
  * @build KullaTesting ExecutionControlTestBase
  * @run testng JdiListeningExecutionControlTest
+ * @key intermittent
  */
 
 
diff -r 3ba0d8631f24 -r e2dc18484400 test/langtools/jdk/jshell/JdiListeningLocalhostExecutionControlTest.java
--- a/test/langtools/jdk/jshell/JdiListeningLocalhostExecutionControlTest.java	Sat May 05 09:24:29 2018 -0700
+++ b/test/langtools/jdk/jshell/JdiListeningLocalhostExecutionControlTest.java	Sat May 05 09:34:01 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @modules jdk.jshell/jdk.jshell.execution
  * @build KullaTesting ExecutionControlTestBase
  * @run testng JdiListeningLocalhostExecutionControlTest
+ * @key intermittent
  */
 
 
diff -r 3ba0d8631f24 -r e2dc18484400 test/langtools/jdk/jshell/ToolBasicTest.java
--- a/test/langtools/jdk/jshell/ToolBasicTest.java	Sat May 05 09:24:29 2018 -0700
+++ b/test/langtools/jdk/jshell/ToolBasicTest.java	Sat May 05 09:34:01 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
  * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask
  * @build KullaTesting TestingInputStream Compiler
  * @run testng/timeout=600 ToolBasicTest
+ * @key intermittent
  */
 
 import java.io.File;
diff -r 3ba0d8631f24 -r e2dc18484400 test/langtools/jdk/jshell/UserJdiUserRemoteTest.java
--- a/test/langtools/jdk/jshell/UserJdiUserRemoteTest.java	Sat May 05 09:24:29 2018 -0700
+++ b/test/langtools/jdk/jshell/UserJdiUserRemoteTest.java	Sat May 05 09:34:01 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Tests for Aux channel, custom remote agents, custom JDI implementations.
  * @build KullaTesting ExecutionControlTestBase MyExecutionControl MyRemoteExecutionControl MyExecutionControlProvider
  * @run testng UserJdiUserRemoteTest
+ * @key intermittent
  */
 import java.io.ByteArrayOutputStream;
 import org.testng.annotations.Test;