From 2da45f12f2a74c25eec46c99041f64f2b77fcdd8 Mon Sep 17 00:00:00 2001
From: Goetz Lindenmaier <goetz@openjdk.org>
Date: Thu, 28 Mar 2019 09:15:41 +0100
Subject: [PATCH] 8221398: Move test NoClassDefFoundMsg.java to subdir
 exceptionMsgs/

Reviewed-by: coleenp
---
 .../NoClassDefFoundError/NoClassDefFoundErrorTest.java}   | 8 ++++----
 .../NoClassDefFoundError/libNoClassDefFoundErrorTest.c}   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename test/hotspot/jtreg/runtime/{noClassDefFoundMsg/NoClassDefFoundMsg.java => exceptionMsgs/NoClassDefFoundError/NoClassDefFoundErrorTest.java} (94%)
 rename test/hotspot/jtreg/runtime/{noClassDefFoundMsg/libNoClassDefFoundMsg.c => exceptionMsgs/NoClassDefFoundError/libNoClassDefFoundErrorTest.c} (83%)

diff --git a/test/hotspot/jtreg/runtime/noClassDefFoundMsg/NoClassDefFoundMsg.java b/test/hotspot/jtreg/runtime/exceptionMsgs/NoClassDefFoundError/NoClassDefFoundErrorTest.java
similarity index 94%
rename from test/hotspot/jtreg/runtime/noClassDefFoundMsg/NoClassDefFoundMsg.java
rename to test/hotspot/jtreg/runtime/exceptionMsgs/NoClassDefFoundError/NoClassDefFoundErrorTest.java
index c85a2f1a47f..d369f77f324 100644
--- a/test/hotspot/jtreg/runtime/noClassDefFoundMsg/NoClassDefFoundMsg.java
+++ b/test/hotspot/jtreg/runtime/exceptionMsgs/NoClassDefFoundError/NoClassDefFoundErrorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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,18 +28,18 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.compiler
- * @run main/native NoClassDefFoundMsg
+ * @run main/native NoClassDefFoundErrorTest
  */
 
 import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.internal.misc.Unsafe;
 
-public class NoClassDefFoundMsg {
+public class NoClassDefFoundErrorTest {
 
     static native void callDefineClass(String className);
     static native void callFindClass(String className);
     static {
-        System.loadLibrary("NoClassDefFoundMsg");
+        System.loadLibrary("NoClassDefFoundErrorTest");
     }
 
 
diff --git a/test/hotspot/jtreg/runtime/noClassDefFoundMsg/libNoClassDefFoundMsg.c b/test/hotspot/jtreg/runtime/exceptionMsgs/NoClassDefFoundError/libNoClassDefFoundErrorTest.c
similarity index 83%
rename from test/hotspot/jtreg/runtime/noClassDefFoundMsg/libNoClassDefFoundMsg.c
rename to test/hotspot/jtreg/runtime/exceptionMsgs/NoClassDefFoundError/libNoClassDefFoundErrorTest.c
index 868263ac270..607d2541a89 100644
--- a/test/hotspot/jtreg/runtime/noClassDefFoundMsg/libNoClassDefFoundMsg.c
+++ b/test/hotspot/jtreg/runtime/exceptionMsgs/NoClassDefFoundError/libNoClassDefFoundErrorTest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
@@ -24,13 +24,13 @@
 #include <jni.h>
 
 JNIEXPORT void JNICALL
-Java_NoClassDefFoundMsg_callDefineClass(JNIEnv *env, jclass klass, jstring className) {
+Java_NoClassDefFoundErrorTest_callDefineClass(JNIEnv *env, jclass klass, jstring className) {
     const char *c_name = (*env)->GetStringUTFChars(env, className, NULL);
     (*env)->DefineClass(env, c_name, NULL, NULL, 0);
 }
 
 JNIEXPORT void JNICALL
-Java_NoClassDefFoundMsg_callFindClass(JNIEnv *env, jclass klass, jstring className) {
+Java_NoClassDefFoundErrorTest_callFindClass(JNIEnv *env, jclass klass, jstring className) {
     const char *c_name;
     jclass cls;
     if (className == NULL) {