From fb27ddcbe5a503ddd841e55baaa9a10f8422b736 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Thu, 14 Jul 2022 15:23:42 +0000
Subject: [PATCH] 8290252: Add TEST.properties to java/nio/channels/FileChannel
 and move tests out of largeMemory sub-dir

Reviewed-by: alanb, jpai
---
 test/jdk/TEST.ROOT                            |  3 +--
 .../LargeGatheringWrite.java                  |  0
 .../{largeMemory => }/MapTest.java            |  0
 .../nio/channels/FileChannel/TEST.properties  | 24 +++++++++++++++++++
 4 files changed, 25 insertions(+), 2 deletions(-)
 rename test/jdk/java/nio/channels/FileChannel/{largeMemory => }/LargeGatheringWrite.java (100%)
 rename test/jdk/java/nio/channels/FileChannel/{largeMemory => }/MapTest.java (100%)
 create mode 100644 test/jdk/java/nio/channels/FileChannel/TEST.properties

diff --git a/test/jdk/TEST.ROOT b/test/jdk/TEST.ROOT
index f617208453c..6cd5ce3654c 100644
--- a/test/jdk/TEST.ROOT
+++ b/test/jdk/TEST.ROOT
@@ -31,8 +31,7 @@ exclusiveAccess.dirs=java/math/BigInteger/largeMemory \
 java/rmi/Naming java/util/prefs sun/management/jmxremote \
 sun/tools/jstatd sun/security/mscapi java/util/Arrays/largeMemory \
 java/util/BitSet/stream javax/rmi java/net/httpclient/websocket \
-com/sun/net/httpserver/simpleserver \
-java/nio/channels/FileChannel/largeMemory
+com/sun/net/httpserver/simpleserver
 
 # Group definitions
 groups=TEST.groups
diff --git a/test/jdk/java/nio/channels/FileChannel/largeMemory/LargeGatheringWrite.java b/test/jdk/java/nio/channels/FileChannel/LargeGatheringWrite.java
similarity index 100%
rename from test/jdk/java/nio/channels/FileChannel/largeMemory/LargeGatheringWrite.java
rename to test/jdk/java/nio/channels/FileChannel/LargeGatheringWrite.java
diff --git a/test/jdk/java/nio/channels/FileChannel/largeMemory/MapTest.java b/test/jdk/java/nio/channels/FileChannel/MapTest.java
similarity index 100%
rename from test/jdk/java/nio/channels/FileChannel/largeMemory/MapTest.java
rename to test/jdk/java/nio/channels/FileChannel/MapTest.java
diff --git a/test/jdk/java/nio/channels/FileChannel/TEST.properties b/test/jdk/java/nio/channels/FileChannel/TEST.properties
new file mode 100644
index 00000000000..19dcdc6aa37
--- /dev/null
+++ b/test/jdk/java/nio/channels/FileChannel/TEST.properties
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2022, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+exclusiveAccess.dirs=.