8289098: clean up ported serviceability/jvmti tests

Reviewed-by: kevinw, sspitsyn

Author: lmesnik

test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/breakpoint01.java

@@ -57,14 +57,7 @@
  */
 public class breakpoint01 {
     static {
-        try {
-            System.loadLibrary("breakpoint01");
-        } catch (UnsatisfiedLinkError ule) {
-            System.err.println("Could not load \"breakpoint01\" library");
-            System.err.println("java.library.path:"
-                + System.getProperty("java.library.path"));
-            throw ule;
-        }
+        System.loadLibrary("breakpoint01");
     }
 
     native int check();

test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/libbreakpoint01.cpp

@@ -55,7 +55,7 @@ static volatile jint result = PASSED;
 static jvmtiEnv *jvmti = NULL;
 static jvmtiEventCallbacks callbacks;
 
-static volatile int callbacksEnabled = NSK_TRUE;
+static volatile int callbacksEnabled = JNI_TRUE;
 static jrawMonitorID agent_lock;
 
 static void initCounters() {
@@ -196,13 +196,13 @@ Breakpoint(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread, jmethodID method, jloca
 void JNICALL
 VMStart(jvmtiEnv *jvmti, JNIEnv *jni) {
   RawMonitorLocker rml(jvmti, jni, agent_lock);
-  callbacksEnabled = NSK_TRUE;
+  callbacksEnabled = JNI_TRUE;
 }
 
 void JNICALL
 VMDeath(jvmtiEnv *jvmti, JNIEnv *jni) {
   RawMonitorLocker rml(jvmti, jni, agent_lock);
-  callbacksEnabled = NSK_FALSE;
+  callbacksEnabled = JNI_FALSE;
 }
 
 JNIEXPORT jint JNICALL

test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/classload01.java

@@ -61,14 +61,7 @@
  */
 public class classload01 {
     static {
-        try {
-            System.loadLibrary("classload01");
-        } catch (UnsatisfiedLinkError ule) {
-            System.err.println("Could not load \"classload01\" library");
-            System.err.println("java.library.path:"
-                + System.getProperty("java.library.path"));
-            throw ule;
-        }
+        System.loadLibrary("classload01");
     }
 
     native int check();

test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/classprep01.java

@@ -21,9 +21,6 @@
  * questions.
  */
 
-import java.io.PrintStream;
-
-
 /*
  * @test
  *
@@ -49,14 +46,7 @@
 public class classprep01 {
 
     static {
-        try {
-            System.loadLibrary("classprep01");
-        } catch (UnsatisfiedLinkError ule) {
-            System.err.println("Could not load classprep01 library");
-            System.err.println("java.library.path:"
-                + System.getProperty("java.library.path"));
-            throw ule;
-        }
+        System.loadLibrary("classprep01");
     }
 
     native static void getReady();

test/hotspot/jtreg/serviceability/jvmti/events/Exception/exception01/exception01.java

@@ -21,8 +21,6 @@
  * questions.
  */
 
-import java.io.PrintStream;
-
 /*
  * @test
  *
@@ -51,14 +49,7 @@
 public class exception01 {
 
     static {
-        try {
-            System.loadLibrary("exception01");
-        } catch (UnsatisfiedLinkError ule) {
-            System.err.println("Could not load exception01 library");
-            System.err.println("java.library.path:"
-                + System.getProperty("java.library.path"));
-            throw ule;
-        }
+        System.loadLibrary("exception01");
     }
 
     static volatile int result;

test/hotspot/jtreg/serviceability/jvmti/events/ExceptionCatch/excatch01/excatch01.java

@@ -49,14 +49,7 @@
 public class excatch01 {
 
     static {
-        try {
-            System.loadLibrary("excatch01");
-        } catch (UnsatisfiedLinkError ule) {
-            System.err.println("Could not load excatch01 library");
-            System.err.println("java.library.path:"
-                + System.getProperty("java.library.path"));
-            throw ule;
-        }
+        System.loadLibrary("excatch01");
     }
 
     static volatile int result;

test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc01/fieldacc01.java

@@ -46,17 +46,8 @@
 
 public class fieldacc01 {
 
-    final static int JCK_STATUS_BASE = 95;
-
     static {
-        try {
-            System.loadLibrary("fieldacc01");
-        } catch (UnsatisfiedLinkError ule) {
-            System.err.println("Could not load fieldacc01 library");
-            System.err.println("java.library.path:"
-                + System.getProperty("java.library.path"));
-            throw ule;
-        }
+        System.loadLibrary("fieldacc01");
     }
 
     static volatile int result;

test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc02/fieldacc02.java

@@ -21,8 +21,6 @@
  * questions.
  */
 
-import java.io.PrintStream;
-
 /*
  * @test
  *
@@ -47,17 +45,8 @@
 
 public class fieldacc02 {
 
-    final static int JCK_STATUS_BASE = 95;
-
     static {
-        try {
-            System.loadLibrary("fieldacc02");
-        } catch (UnsatisfiedLinkError ule) {
-            System.err.println("Could not load fieldacc02 library");
-            System.err.println("java.library.path:"
-                + System.getProperty("java.library.path"));
-            throw ule;
-        }
+        System.loadLibrary("fieldacc02");
     }
 
     static volatile int result;

test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc03/fieldacc03.java

@@ -21,8 +21,6 @@
  * questions.
  */
 
-import java.io.PrintStream;
-
 /*
  * @test
  *
@@ -48,17 +46,8 @@
 
 public class fieldacc03 {
 
-    final static int JCK_STATUS_BASE = 95;
-
     static {
-        try {
-            System.loadLibrary("fieldacc03");
-        } catch (UnsatisfiedLinkError ule) {
-            System.err.println("Could not load fieldacc03 library");
-            System.err.println("java.library.path:"
-                + System.getProperty("java.library.path"));
-            throw ule;
-        }
+        System.loadLibrary("fieldacc03");
     }
 
     static volatile int result;

test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc04/fieldacc04.java

@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import java.io.PrintStream;
 
 /*
  * @test
@@ -46,17 +45,8 @@
 
 public class fieldacc04 {
 
-    final static int JCK_STATUS_BASE = 95;
-
     static {
-        try {
-            System.loadLibrary("fieldacc04");
-        } catch (UnsatisfiedLinkError ule) {
-            System.err.println("Could not load fieldacc04 library");
-            System.err.println("java.library.path:"
-                + System.getProperty("java.library.path"));
-            throw ule;
-        }
+        System.loadLibrary("fieldacc04");
     }
 
     static volatile int result;