diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001.java
index 8ff5df69af0..87603829970 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -96,7 +96,10 @@ public class awevent001 {
private Object gotEvent = new Object();
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001/TestDescription.java
index adec63382b2..db0902d5a4a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* @clean nsk.jdi.AccessWatchpointEvent._itself_.awevent001t
* @compile -g:lines,source,vars ../awevent001t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.AccessWatchpointEvent._itself_.awevent001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001.java
index cdb66bdcf8e..7378c4dc96b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -80,13 +80,12 @@ public class accipp001 extends Log {
{debugeeName+"$P", "package private"}
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
- public static void main (String args[]) {
- int exitCode = run(args,System.out);
- System.exit(exitCode + 95);
+
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001/TestDescription.java
index 205fe7c0c7e..3609b48a214 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* /test/lib
* @build nsk.jdi.Accessible.isPackagePrivate.accipp001
* nsk.jdi.Accessible.isPackagePrivate.accipp001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Accessible.isPackagePrivate.accipp001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002.java
index e24055f5b55..3617e16e0c4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -64,7 +64,10 @@ public class accipp002 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002/TestDescription.java
index 712e807b92d..bc110925183 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -50,7 +50,7 @@
* /test/lib
* @build nsk.jdi.Accessible.isPackagePrivate.accipp002
* nsk.jdi.Accessible.isPackagePrivate.accipp002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Accessible.isPackagePrivate.accipp002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001.java
index 9e4ba59010e..c85fa1c0a2a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -86,13 +86,13 @@ public class isPrivate001 extends Log {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001/TestDescription.java
index 5fbe4bf5f27..eb4569cda0b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.Accessible.isPrivate.isPrivate001
* nsk.jdi.Accessible.isPrivate.isPrivate001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Accessible.isPrivate.isPrivate001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002.java
index 87ca6dedb27..0417853577b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -64,7 +64,10 @@ public class isprivate002 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002/TestDescription.java
index 45592c34b9b..b738ab1fde3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -50,7 +50,7 @@
* /test/lib
* @build nsk.jdi.Accessible.isPrivate.isprivate002
* nsk.jdi.Accessible.isPrivate.isprivate002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Accessible.isPrivate.isprivate002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isProtected001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isProtected001.java
index 12e81ca0577..b1d5cfdf199 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isProtected001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isProtected001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -86,13 +86,13 @@ public class isProtected001 extends Log {
{debugeeName+"$P", "package private", "reference_type"}
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isProtected001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isProtected001/TestDescription.java
index 191f174be12..3f16eb2378b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isProtected001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isProtected001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,7 @@
* /test/lib
* @build nsk.jdi.Accessible.isProtected.isProtected001
* nsk.jdi.Accessible.isProtected.isProtected001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Accessible.isProtected.isProtected001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isprotected002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isprotected002.java
index 1f1cd5944fa..4aae1768a8f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isprotected002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isprotected002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -64,7 +64,10 @@ public class isprotected002 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isprotected002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isprotected002/TestDescription.java
index 76dbc1636ed..be55fcec367 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isprotected002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isprotected002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -50,7 +50,7 @@
* /test/lib
* @build nsk.jdi.Accessible.isProtected.isprotected002
* nsk.jdi.Accessible.isProtected.isprotected002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Accessible.isProtected.isprotected002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/isPublic001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/isPublic001.java
index d4d51966cbb..d4883f7573c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/isPublic001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/isPublic001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -86,13 +86,13 @@ public class isPublic001 extends Log {
{debugeeName+"$P", "package private", "reference_type"}
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/isPublic001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/isPublic001/TestDescription.java
index 8fe7f950bb1..50fe8fd8015 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/isPublic001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/isPublic001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,7 @@
* /test/lib
* @build nsk.jdi.Accessible.isPublic.isPublic001
* nsk.jdi.Accessible.isPublic.isPublic001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Accessible.isPublic.isPublic001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic002.java
index 9495f939a2d..fcd0916ae21 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -65,7 +65,10 @@ public class ispublic002 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic002/TestDescription.java
index 49afde9f574..6b530b3fc96 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.Accessible.isPublic.ispublic002
* nsk.jdi.Accessible.isPublic.ispublic002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Accessible.isPublic.ispublic002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic003.java
index c1adf733fb3..7d0da2b0356 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -64,7 +64,10 @@ public class ispublic003 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic003/TestDescription.java
index c2d09535943..14a4eae74b1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -50,7 +50,7 @@
* /test/lib
* @build nsk.jdi.Accessible.isPublic.ispublic003
* nsk.jdi.Accessible.isPublic.ispublic003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Accessible.isPublic.ispublic003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001.java
index 63840b2f428..8fe0a939871 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -79,13 +79,13 @@ public class modifiers001 extends Log {
{package_prefix + "interf", "abstract, interface", "interface"}
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001/TestDescription.java
index ee68d752dce..dc00a5d81cf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.Accessible.modifiers.modifiers001
* nsk.jdi.Accessible.modifiers.modifiers001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Accessible.modifiers.modifiers001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers002.java
index 137841869c8..c74191a26b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -64,7 +64,10 @@ public class modifiers002 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers002/TestDescription.java
index bfc64993ab3..595faca777f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.Accessible.modifiers.modifiers002
* nsk.jdi.Accessible.modifiers.modifiers002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Accessible.modifiers.modifiers002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001.java
index 7b4f492cef0..e9ea302210d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -46,7 +46,10 @@ public class description001 {
private static Log log;
public static void main( String argv[] ) {
- System.exit(run(argv, System.out)+95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001/TestDescription.java
index d096839a098..399d076bb21 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -42,7 +42,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Argument.description.description001
- * @run main/othervm
+ * @run driver
* nsk.jdi.Argument.description.description001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001.java
index 78c1b998641..3cc943023e5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -59,7 +59,10 @@ import com.sun.jdi.connect.Connector.BooleanArgument;
public class isvalid001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001/TestDescription.java
index a4695a2addd..68d8ba344c0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Argument.isValid.isvalid001
- * @run main/othervm
+ * @run driver
* nsk.jdi.Argument.isValid.isvalid001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002.java
index 9b751b240f4..3a7a1824ca2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -54,7 +54,10 @@ import com.sun.jdi.connect.Connector.BooleanArgument;
public class isvalid002 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002/TestDescription.java
index 94e408e0012..08866e15ce7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Argument.isValid.isvalid002
- * @run main/othervm
+ * @run driver
* nsk.jdi.Argument.isValid.isvalid002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003.java
index 5ac66a4bc73..fa76401da01 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -60,7 +60,10 @@ import com.sun.jdi.connect.Connector.BooleanArgument;
public class isvalid003 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003/TestDescription.java
index 577db5ecdc8..dbe3e467c14 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Argument.isValid.isvalid003
- * @run main/othervm
+ * @run driver
* nsk.jdi.Argument.isValid.isvalid003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004.java
index b6c8d79ce8f..0dd38ac963a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -61,7 +61,10 @@ import com.sun.jdi.connect.Connector.IntegerArgument;
public class isvalid004 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004/TestDescription.java
index ad4201210d0..db7e776c632 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -78,7 +78,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Argument.isValid.isvalid004
- * @run main/othervm
+ * @run driver
* nsk.jdi.Argument.isValid.isvalid004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005.java
index 1add4e1ca37..097cf617603 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -60,7 +60,10 @@ import com.sun.jdi.connect.Connector.IntegerArgument;
public class isvalid005 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005/TestDescription.java
index f7df96ddea4..2f0992de998 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Argument.isValid.isvalid005
- * @run main/othervm
+ * @run driver
* nsk.jdi.Argument.isValid.isvalid005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001.java
index 8d09663ffcc..1e9a9571bc9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -46,7 +46,10 @@ public class label001 {
private static Log log;
public static void main( String argv[] ) {
- System.exit(run(argv, System.out)+95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001/TestDescription.java
index 43b7e639ef5..0490b5af9bd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -42,7 +42,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Argument.label.label001
- * @run main/othervm
+ * @run driver
* nsk.jdi.Argument.label.label001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001.java
index dadbad24efb..1579a391f06 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -56,7 +56,10 @@ import com.sun.jdi.connect.Connector.IntegerArgument;
public class mustspecify001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001/TestDescription.java
index cbff0688ff4..95c0b98761e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -42,7 +42,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Argument.mustSpecify.mustspecify001
- * @run main/othervm
+ * @run driver
* nsk.jdi.Argument.mustSpecify.mustspecify001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001.java
index 572d8047f57..c2f8ccfccce 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -45,7 +45,10 @@ public class name001 {
private static Log log;
public static void main( String argv[] ) {
- System.exit(run(argv, System.out)+95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[],PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001/TestDescription.java
index 7c2396bb705..945c8ddc574 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -41,7 +41,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Argument.name.name001
- * @run main/othervm
+ * @run driver
* nsk.jdi.Argument.name.name001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001.java
index 873b26b8133..052e90e3b27 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -56,7 +56,10 @@ import com.sun.jdi.connect.Connector.Argument;
public class setvalue001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001/TestDescription.java
index 63dc335e149..fff80ff8e36 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Argument.setValue.setvalue001
- * @run main/othervm
+ * @run driver
* nsk.jdi.Argument.setValue.setvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002.java
index fef74f3db37..d225da60005 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -60,7 +60,10 @@ import com.sun.jdi.connect.LaunchingConnector;
public class setvalue002 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002/TestDescription.java
index e1e992b78b2..59f87109ec3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Argument.setValue.setvalue002
- * @run main/othervm
+ * @run driver
* nsk.jdi.Argument.setValue.setvalue002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001.java
index 6629c3efd26..e741706fac7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -45,7 +45,10 @@ public class value001 {
private static Log log;
public static void main( String argv[] ) {
- System.exit(run(argv, System.out)+95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001/TestDescription.java
index 25f9fada8ea..8df9ff49c29 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -41,7 +41,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Argument.value.value001
- * @run main/othervm
+ * @run driver
* nsk.jdi.Argument.value.value001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002.java
index 6a7c8a585a0..45cb65e4154 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -46,7 +46,10 @@ public class value002 {
private static Log log;
public static void main( String argv[] ) {
- System.exit(run(argv, System.out)+95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002/TestDescription.java
index 87af6a2f944..228ba20f1ee 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -41,7 +41,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Argument.value.value002
- * @run main/othervm
+ * @run driver
* nsk.jdi.Argument.value.value002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value003.java
index e845a809a01..4dcbd2a3330 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -55,7 +55,10 @@ public class value003 {
private static Log log;
public static void main(String argv[] ) {
- System.exit(run(argv, System.out)+95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value004.java
index d6fc6f6445c..bbfb4f05571 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -57,7 +57,10 @@ public class value004 {
private static Log log;
public static void main( String argv[] ) {
- System.exit(run(argv, System.out)+95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[],PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue001.java
index 1736c5ec210..2a0a0a506c5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -74,7 +74,10 @@ public class getvalue001 {
private final static String classToCheckName = prefix + "getvalue001aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue001/TestDescription.java
index acd4f034e75..912b0de8a7d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.getValue.getvalue001
* nsk.jdi.ArrayReference.getValue.getvalue001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.getValue.getvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue002.java
index 7eddcfe435d..fdf32c8bbab 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -60,7 +60,10 @@ public class getvalue002 {
private final static String classToCheckName = prefix + "getvalue002aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue002/TestDescription.java
index a841f12a382..8ade9f0b200 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.getValue.getvalue002
* nsk.jdi.ArrayReference.getValue.getvalue002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.getValue.getvalue002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue003.java
index aacff00cae4..52604901063 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -58,7 +58,10 @@ public class getvalue003 {
}
public static void main(String argv[]) {
- System.exit(JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue003/TestDescription.java
index 59e8e8e9490..ab3e503ad59 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.getValue.getvalue003
* nsk.jdi.ArrayReference.getValue.getvalue003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.getValue.getvalue003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues001.java
index 2bf5f8ea319..667c890af70 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,7 +75,10 @@ public class getvalues001 {
private final static String classToCheckName = prefix + "getvalues001aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues001/TestDescription.java
index 29945cc1273..860698ef2ef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.getValues.getvalues001
* nsk.jdi.ArrayReference.getValues.getvalues001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.getValues.getvalues001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues002.java
index c8d1d291d91..d20bbd88ef1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -44,7 +44,10 @@ public class getvalues002 {
private final static String classToCheckName = prefix + "getvalues002aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues002/TestDescription.java
index 988546deeab..949e6bae0f6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.getValues.getvalues002
* nsk.jdi.ArrayReference.getValues.getvalues002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.getValues.getvalues002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues003.java
index 10a6cdf9f66..ea869318722 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -58,7 +58,10 @@ public class getvalues003 {
}
public static void main(String argv[]) {
- System.exit(JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues003/TestDescription.java
index 7fde2191cc5..7b94fc467cf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.getValues.getvalues003
* nsk.jdi.ArrayReference.getValues.getvalues003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.getValues.getvalues003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii001.java
index 154d5176d2f..466d5838b96 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -104,7 +104,10 @@ public class getvaluesii001 {
private final static String classToCheckName = prefix + "getvaluesii001aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii001/TestDescription.java
index aa071b080ce..32b232f8484 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.getValues_ii.getvaluesii001
* nsk.jdi.ArrayReference.getValues_ii.getvaluesii001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.getValues_ii.getvaluesii001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii002.java
index ae24619599b..96d58ed58d7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -119,7 +119,10 @@ public class getvaluesii002 {
private final static String classToCheckName = prefix + "getvaluesii002aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii002/TestDescription.java
index 17934d81228..ec2409ff6c1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.getValues_ii.getvaluesii002
* nsk.jdi.ArrayReference.getValues_ii.getvaluesii002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.getValues_ii.getvaluesii002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii003.java
index 3502d25a80e..85d2394e5ef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -61,7 +61,10 @@ public class getvaluesii003 {
private final static String classToCheckName = prefix + "getvaluesii003aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii003/TestDescription.java
index e5188c1bedf..d710cab79d4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.getValues_ii.getvaluesii003
* nsk.jdi.ArrayReference.getValues_ii.getvaluesii003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.getValues_ii.getvaluesii003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii004.java
index ec597298570..f15e3e6da89 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -61,7 +61,10 @@ public class getvaluesii004 {
private final static String classToCheckName = prefix + "getvaluesii004aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii004/TestDescription.java
index 052c725185a..10714728952 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.getValues_ii.getvaluesii004
* nsk.jdi.ArrayReference.getValues_ii.getvaluesii004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.getValues_ii.getvaluesii004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii005.java
index b0dd52a77a4..9f76c7dcf93 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -89,7 +89,10 @@ public class getvaluesii005 {
private IOPipe pipe;
public static void main(String argv[]) {
- System.exit(JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii005/TestDescription.java
index de30a9c4ec0..6007af5b33e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -82,7 +82,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.getValues_ii.getvaluesii005
* nsk.jdi.ArrayReference.getValues_ii.getvaluesii005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.getValues_ii.getvaluesii005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/length/length001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/length/length001.java
index bd714acb6a6..7f6302f7b9f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/length/length001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/length/length001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,10 @@ public class length001 {
private final static String classToCheckName = prefix + "ClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/length/length001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/length/length001/TestDescription.java
index 8f57e9099ec..7d0ea25f481 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/length/length001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/length/length001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.length.length001
* nsk.jdi.ArrayReference.length.length001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.length.length001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue001.java
index b3a734714f8..e18c6eb3a2e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -59,7 +59,10 @@ public class setvalue001 {
private final static String classToCheckName = prefix + "setvalue001aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue001/TestDescription.java
index ff2a8ebc4cb..a9d2c2e30d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -73,7 +73,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.setValue.setvalue001
* nsk.jdi.ArrayReference.setValue.setvalue001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.setValue.setvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue002.java
index 07d927847cd..0d875f1c347 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -60,7 +60,10 @@ public class setvalue002 {
private final static String classToCheckName = prefix + "setvalue002aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue002/TestDescription.java
index 3e6aa8bce89..1b8d9d025d2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.setValue.setvalue002
* nsk.jdi.ArrayReference.setValue.setvalue002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.setValue.setvalue002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue003.java
index e9a22291b24..b737a002a06 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -67,7 +67,10 @@ public class setvalue003 {
private ReferenceType refType;
public static void main(String argv[]) {
- System.exit(JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue003/TestDescription.java
index 52be7a0ec6a..59115234360 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -83,7 +83,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.setValue.setvalue003
* nsk.jdi.ArrayReference.setValue.setvalue003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.setValue.setvalue003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii001.java
index 4a1f6e6a413..541c3fc1a9d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -106,7 +106,10 @@ public class setvaluesilii001 {
private final static String classToCheckName = prefix + "setvaluesilii001aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii001/TestDescription.java
index 7687ee1acc3..4c7eab6b08f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -79,7 +79,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii001
* nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii002.java
index 9d502ab0468..594176c0e05 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -105,7 +105,10 @@ public class setvaluesilii002 {
private final static String classToCheckName = prefix + "setvaluesilii002aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii002/TestDescription.java
index 3c68c6c36e7..1b4d3c2e396 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -78,7 +78,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii002
* nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii003.java
index 7077c381c1d..8a6825cf7e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -60,7 +60,10 @@ public class setvaluesilii003 {
private final static String classToCheckName = prefix + "setvaluesilii003aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii003/TestDescription.java
index e1b673f6790..6f3b3db0faa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -85,7 +85,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii003
* nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii004.java
index ca447ac0d47..d1bf963267d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -60,7 +60,10 @@ public class setvaluesilii004 {
private final static String classToCheckName = prefix + "setvaluesilii004aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii004/TestDescription.java
index 0a234c54a0e..45538c12cd2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -75,7 +75,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii004
* nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii005.java
index 5422f9deb11..6d2ce6e4080 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -60,7 +60,10 @@ public class setvaluesilii005 {
private final static String classToCheckName = prefix + "setvaluesilii005aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii005/TestDescription.java
index 151c29cd12a..e724ba4dbdc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -76,7 +76,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii005
* nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl001.java
index 679cbb9a3da..e0cfb1e1522 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,7 +75,10 @@ public class setvaluesl001 {
private final static String classToCheckName = prefix + "setvaluesl001aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl001/TestDescription.java
index e7e050d5da0..c26fb444c96 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -77,7 +77,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.setValues_l.setvaluesl001
* nsk.jdi.ArrayReference.setValues_l.setvaluesl001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.setValues_l.setvaluesl001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl002.java
index a930c8b3035..6e73402732c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,7 +75,10 @@ public class setvaluesl002 {
private final static String classToCheckName = prefix + "setvaluesl002aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl002/TestDescription.java
index 1f0308b4ffc..75e3a2f6613 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -84,7 +84,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.setValues_l.setvaluesl002
* nsk.jdi.ArrayReference.setValues_l.setvaluesl002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.setValues_l.setvaluesl002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl003.java
index ce3dfd9412b..720f5f1a3d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -50,7 +50,10 @@ public class setvaluesl003 {
private ObjectReference testedObject;
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl003/TestDescription.java
index 037504614bb..c5c78e2584c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -86,7 +86,7 @@
* /test/lib
* @build nsk.jdi.ArrayReference.setValues_l.setvaluesl003
* nsk.jdi.ArrayReference.setValues_l.setvaluesl003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayReference.setValues_l.setvaluesl003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature001.java
index 1ae6a0796b9..ba939251978 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,9 @@ public class componentsignature001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature001/TestDescription.java
index 85a84797713..5057a521e98 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.ArrayType.componentSignature.componentsignature001
* nsk.jdi.ArrayType.componentSignature.componentsignature001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayType.componentSignature.componentsignature001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature002.java
index d6001914056..368f7d88c92 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,7 +69,9 @@ public class componentsignature002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature002/TestDescription.java
index 66f90a5dd2f..5a6abed8ed7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.ArrayType.componentSignature.componentsignature002
* nsk.jdi.ArrayType.componentSignature.componentsignature002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayType.componentSignature.componentsignature002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentType/componenttype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentType/componenttype001.java
index 3a376b9e176..53c438409a8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentType/componenttype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentType/componenttype001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,9 @@ public class componenttype001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentType/componenttype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentType/componenttype001/TestDescription.java
index dfc6d18697b..558cbe9d474 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentType/componenttype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentType/componenttype001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.ArrayType.componentType.componenttype001
* nsk.jdi.ArrayType.componentType.componenttype001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayType.componentType.componenttype001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename001.java
index deb7d52a6d7..ae158dc434e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,9 @@ public class componenttypename001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename001/TestDescription.java
index d4046f0a6be..a984618336f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.ArrayType.componentTypeName.componenttypename001
* nsk.jdi.ArrayType.componentTypeName.componenttypename001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayType.componentTypeName.componenttypename001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename002.java
index 49e883eaeb6..5ecf529cd0a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -68,7 +68,9 @@ public class componenttypename002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename002/TestDescription.java
index d57541e1ebf..38fa7e9f377 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.ArrayType.componentTypeName.componenttypename002
* nsk.jdi.ArrayType.componentTypeName.componenttypename002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayType.componentTypeName.componenttypename002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance001.java
index f6d36d0aa77..a940ae34cc6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,7 +77,9 @@ public class newinstance001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance001/TestDescription.java
index 3ce6b459e1f..f760085e7d5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.ArrayType.newInstance.newinstance001
* nsk.jdi.ArrayType.newInstance.newinstance001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayType.newInstance.newinstance001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance002.java
index 37dca6a8ca1..bf9e30e52e3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -74,7 +74,9 @@ public class newinstance002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance002/TestDescription.java
index b1f981f9b78..6ea12805038 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.ArrayType.newInstance.newinstance002
* nsk.jdi.ArrayType.newInstance.newinstance002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayType.newInstance.newinstance002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance003.java
index c505233b327..67ee334c21f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -73,7 +73,9 @@ public class newinstance003 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance003/TestDescription.java
index dd8e6993c3e..ddd53076370 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.ArrayType.newInstance.newinstance003
* nsk.jdi.ArrayType.newInstance.newinstance003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayType.newInstance.newinstance003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance004.java
index 5093afd6919..ba308c53f42 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -73,7 +73,9 @@ public class newinstance004 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance004/TestDescription.java
index 1e23bf7d8e7..ad6ffddf10c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.ArrayType.newInstance.newinstance004
* nsk.jdi.ArrayType.newInstance.newinstance004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ArrayType.newInstance.newinstance004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java
index b4ba572147f..fe24c654361 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -62,7 +62,10 @@ public class attach001 {
IORedirector errRedirector;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java
index 56c68e64b16..4b5fd75a88c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -62,7 +62,10 @@ public class attach002 extends Log {
IORedirector errRedirector;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002/TestDescription.java
index f416e43f66d..32ca1122f01 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003.java
index a7b52e9f6b8..11ab596a521 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -55,7 +55,10 @@ public class attach003 {
private static Log log;
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003/TestDescription.java
index ee41bba9b8b..a8ff5a8a9f7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.AttachingConnector.attach.attach003
- * @run main/othervm
+ * @run driver
* nsk.jdi.AttachingConnector.attach.attach003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/TestDriver.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/TestDriver.java
index 1860b612829..aadbe4887ac 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/TestDriver.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/TestDriver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@ public class TestDriver {
Process debugger = startDebugger(jdiArgs, Arrays.copyOfRange(args, 3, args.length), debuggee.pid());
int debuggerExit = debugger.waitFor();
- if (debuggerExit != 95) {
+ if (debuggerExit != 0) {
throw new Error("debugger exit code is " + debuggerExit);
}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/attach004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/attach004.java
index e7346f124c6..d88fc5d7055 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/attach004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/attach004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -59,7 +59,10 @@ public class attach004 extends ConnectorTest {
}
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java
index a3e68fe4c9b..facfe9c2c48 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -62,7 +62,10 @@ public class attachnosuspend001 {
IORedirector errRedirector;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x001.java
index 6aac8fbc989..835e3c42758 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -95,7 +95,10 @@ public class tc01x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x001/TestDescription.java
index 6b582a926d6..9e40c8ea679 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.hotswap.tc01x001
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x002.java
index 48a6411dfe4..6ad0573ea8c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -96,7 +96,10 @@ public class tc01x002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x002/TestDescription.java
index 63fb8589ee2..e269c38a618 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -75,7 +75,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.hotswap.tc01x002
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x001.java
index aba42b2ce3c..2a9a9937c8f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -100,7 +100,10 @@ public class tc02x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x001/TestDescription.java
index 1005e28eb43..80c28a6b8af 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -79,7 +79,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.hotswap.tc02x001
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x002.java
index eaeb7cbdc5d..9aed2be83c1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -101,7 +101,10 @@ public class tc02x002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x002/TestDescription.java
index ba0345aba15..b0dc1c16d42 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -78,7 +78,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.hotswap.tc02x002
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc03x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc03x001.java
index 16644e8f6e2..6b40c027580 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc03x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc03x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -92,7 +92,10 @@ public class tc03x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc03x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc03x001/TestDescription.java
index ce46e0e9ef0..44616b135cf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc03x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc03x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.hotswap.tc03x001
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x001.java
index 1cc69d32311..4fbbf2b01b0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -99,7 +99,10 @@ public class tc04x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x001/TestDescription.java
index 4dd691ee2ce..336e17f5bb0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -79,7 +79,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.hotswap.tc04x001
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x002.java
index 467af1742fe..0ad83acc8ff 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -100,7 +100,10 @@ public class tc04x002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x002/TestDescription.java
index 419adea0a79..bc780677ac4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -78,7 +78,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.hotswap.tc04x002
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x001.java
index 47a49b89bf4..16bc4ffbb74 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -98,7 +98,10 @@ public class tc05x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x001/TestDescription.java
index fddc0bd3921..a775125b384 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -75,7 +75,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.hotswap.tc05x001
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x002.java
index 8523866c886..bdb943fc134 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -94,7 +94,10 @@ public class tc05x002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x002/TestDescription.java
index 372c88791fd..8251f2a0fc9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -76,7 +76,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.hotswap.tc05x002
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc06x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc06x001.java
index 8bb869b9ed7..1a1da5a58f8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc06x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc06x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -104,7 +104,10 @@ public class tc06x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc06x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc06x001/TestDescription.java
index 1272094437f..b5b690201e6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc06x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc06x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -81,7 +81,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.hotswap.tc06x001
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc07x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc07x001.java
index d8bfa5ab6b4..ced67044d0a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc07x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc07x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -101,7 +101,10 @@ public class tc07x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc07x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc07x001/TestDescription.java
index 9d76431accc..fa244ccfb69 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc07x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc07x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -76,7 +76,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.hotswap.tc07x001
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc08x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc08x001.java
index 9cbd96a4de2..7cd7fe5b95d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc08x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc08x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -98,7 +98,10 @@ public class tc08x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc08x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc08x001/TestDescription.java
index a5e68b06454..c1debc8c7b2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc08x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc08x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.hotswap.tc08x001
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x001.java
index 283d50bcce4..dfc76cdb143 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -95,7 +95,10 @@ public class tc09x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x001/TestDescription.java
index c45cf8d828e..a3db3d5ce85 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.hotswap.tc09x001
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x002.java
index 5c6308c4a69..bdb1fdf1bcf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -94,7 +94,10 @@ public class tc09x002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x002/TestDescription.java
index e7b9f658e11..0d24231c2ef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -75,7 +75,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.hotswap.tc09x002
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001.java
index 5bb46c42153..33fe7a74569 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -93,7 +93,10 @@ public class tc10x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java
index a8d335ef96a..0a890392efa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -79,7 +79,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.hotswap.tc10x001
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x002.java
index 252d8404fe1..b671d41a033 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -96,7 +96,10 @@ public class tc10x002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x002/TestDescription.java
index 622cc9591a0..49f344b729d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -82,7 +82,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.hotswap.tc10x002
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc01x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc01x001.java
index ec720d829ed..e2a2d7669bc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc01x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc01x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -84,7 +84,10 @@ public class tc01x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc01x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc01x001/TestDescription.java
index 08d2d19ddc8..b2664cd2281 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc01x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc01x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.BScenarios.multithrd.tc01x001
* nsk.jdi.BScenarios.multithrd.tc01x001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.multithrd.tc01x001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x001.java
index 6803fd51629..b7a0977c1c2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -81,7 +81,10 @@ public class tc02x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x001/TestDescription.java
index b9cd0d7c65a..f9fe2fd4f56 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.BScenarios.multithrd.tc02x001
* nsk.jdi.BScenarios.multithrd.tc02x001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.multithrd.tc02x001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x002.java
index 960ef8ed2ca..2c654ad5e97 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -85,7 +85,10 @@ public class tc02x002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x002/TestDescription.java
index c33d5635b4a..a528b3a0ecc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -78,7 +78,7 @@
* /test/lib
* @build nsk.jdi.BScenarios.multithrd.tc02x002
* nsk.jdi.BScenarios.multithrd.tc02x002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.multithrd.tc02x002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003.java
index 79bb11fc706..78f7c206a46 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -85,7 +85,10 @@ public class tc02x003 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003/TestDescription.java
index cac17bb5035..5898bd53525 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -78,7 +78,7 @@
* /test/lib
* @build nsk.jdi.BScenarios.multithrd.tc02x003
* nsk.jdi.BScenarios.multithrd.tc02x003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.multithrd.tc02x003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004.java
index 659a8f45240..771313f4c1a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -84,7 +84,10 @@ public class tc02x004 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004/TestDescription.java
index 7fb53cad647..3418981ee73 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.BScenarios.multithrd.tc02x004
* nsk.jdi.BScenarios.multithrd.tc02x004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.multithrd.tc02x004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc03x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc03x001.java
index 986f5549ad2..dc04b9056eb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc03x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc03x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -85,7 +85,10 @@ public class tc03x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc03x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc03x001/TestDescription.java
index 8e6463386b5..16c30880f5d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc03x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc03x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.BScenarios.multithrd.tc03x001
* nsk.jdi.BScenarios.multithrd.tc03x001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.multithrd.tc03x001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc04x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc04x001.java
index c72ef73a416..f2fc0e368ec 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc04x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc04x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -82,7 +82,10 @@ public class tc04x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc04x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc04x001/TestDescription.java
index 5a8564c6645..afa2a35c6eb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc04x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc04x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* /test/lib
* @build nsk.jdi.BScenarios.multithrd.tc04x001
* nsk.jdi.BScenarios.multithrd.tc04x001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.multithrd.tc04x001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x001.java
index 337e3654c0f..2b4269779ef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -84,7 +84,10 @@ public class tc01x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x001/TestDescription.java
index c3768ac1dfc..6e8542892cb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.BScenarios.singlethrd.tc01x001
* nsk.jdi.BScenarios.singlethrd.tc01x001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.singlethrd.tc01x001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x002.java
index b5ac0a1590c..abd8fa7646f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -84,7 +84,10 @@ public class tc01x002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x002/TestDescription.java
index 4dcec5a9277..e0b105d8414 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* /test/lib
* @build nsk.jdi.BScenarios.singlethrd.tc01x002
* nsk.jdi.BScenarios.singlethrd.tc01x002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.singlethrd.tc01x002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc02x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc02x001.java
index 80e3b1df992..5ce83122932 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc02x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc02x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -83,7 +83,10 @@ public class tc02x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc02x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc02x001/TestDescription.java
index 084026c090b..2e9dcb349d9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc02x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc02x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.BScenarios.singlethrd.tc02x001
* nsk.jdi.BScenarios.singlethrd.tc02x001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.singlethrd.tc02x001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x001.java
index fe2fec7036c..35318ad3d20 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -82,7 +82,10 @@ public class tc03x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x001/TestDescription.java
index 0ca5f14aa69..cda8a060f5b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.BScenarios.singlethrd.tc03x001
* nsk.jdi.BScenarios.singlethrd.tc03x001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.singlethrd.tc03x001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x002.java
index 245d923a4ac..0c7f0157cfb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -85,7 +85,10 @@ public class tc03x002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x002/TestDescription.java
index 2a5ff6bfd40..f62f9c32a24 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -76,7 +76,7 @@
* /test/lib
* @build nsk.jdi.BScenarios.singlethrd.tc03x002
* nsk.jdi.BScenarios.singlethrd.tc03x002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.singlethrd.tc03x002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x003.java
index 7687f8fdd36..639aebadab1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -85,7 +85,10 @@ public class tc03x003 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x003/TestDescription.java
index bd381b10250..1a10f8284c3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -76,7 +76,7 @@
* /test/lib
* @build nsk.jdi.BScenarios.singlethrd.tc03x003
* nsk.jdi.BScenarios.singlethrd.tc03x003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.singlethrd.tc03x003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc04x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc04x001.java
index 4297b956a52..da1b81bda01 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc04x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc04x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -86,7 +86,10 @@ public class tc04x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc04x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc04x001/TestDescription.java
index 589f3046384..a30e3a91875 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc04x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc04x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.BScenarios.singlethrd.tc04x001
* nsk.jdi.BScenarios.singlethrd.tc04x001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.singlethrd.tc04x001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc05x001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc05x001.java
index 8a71e950723..e6a410b952c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc05x001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc05x001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -83,7 +83,10 @@ public class tc05x001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc05x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc05x001/TestDescription.java
index 85f0fbbc28e..5ad6240f0c9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc05x001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc05x001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.BScenarios.singlethrd.tc05x001
* nsk.jdi.BScenarios.singlethrd.tc05x001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BScenarios.singlethrd.tc05x001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001.java
index abf880997ce..6dcb9961762 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -61,7 +61,10 @@ import com.sun.jdi.connect.LaunchingConnector;
public class booleanvalue001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001/TestDescription.java
index dc652ddbdd7..b0de57d9052 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -82,7 +82,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.BooleanArgument.booleanValue.booleanvalue001
- * @run main/othervm
+ * @run driver
* nsk.jdi.BooleanArgument.booleanValue.booleanvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002.java
index e74db7c1390..c89f02a0ab4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -61,7 +61,10 @@ import com.sun.jdi.connect.LaunchingConnector;
public class booleanvalue002 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002/TestDescription.java
index 1eb8fcd49d4..e4412f8364b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.BooleanArgument.booleanValue.booleanvalue002
- * @run main/othervm
+ * @run driver
* nsk.jdi.BooleanArgument.booleanValue.booleanvalue002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001.java
index b2bae31a334..7cc526f568c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -60,7 +60,10 @@ import com.sun.jdi.connect.LaunchingConnector;
public class isvalid001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001/TestDescription.java
index f8b3bf5becf..9e2c9f683ab 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.BooleanArgument.isValid.isvalid001
- * @run main/othervm
+ * @run driver
* nsk.jdi.BooleanArgument.isValid.isvalid001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002.java
index 0b0f883aba4..fb9ab0d7917 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -54,7 +54,10 @@ import com.sun.jdi.connect.LaunchingConnector;
public class isvalid002 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002/TestDescription.java
index 39e3f9b97b2..230a3ca16e3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.BooleanArgument.isValid.isvalid002
- * @run main/othervm
+ * @run driver
* nsk.jdi.BooleanArgument.isValid.isvalid002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001.java
index 4850009bc09..544d2826b14 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -74,7 +74,10 @@ import com.sun.jdi.connect.Connector.BooleanArgument;
public class setvalue001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001/TestDescription.java
index 49295a7ad6f..bc74f58947f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.BooleanArgument.setValue.setvalue001
- * @run main/othervm
+ * @run driver
* nsk.jdi.BooleanArgument.setValue.setvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002.java
index f1bd14421e8..f32a6888b6a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -70,7 +70,10 @@ import com.sun.jdi.connect.Connector.BooleanArgument;
public class setvalue002 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002/TestDescription.java
index 7823f9ebb88..b9f5871d2af 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.BooleanArgument.setValue.setvalue002
- * @run main/othervm
+ * @run driver
* nsk.jdi.BooleanArgument.setValue.setvalue002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001.java
index 853b677db1c..d12821a74d9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -59,7 +59,10 @@ import com.sun.jdi.connect.Connector.BooleanArgument;
public class stringvalueof001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001/TestDescription.java
index ac0ef096331..97ba0b86341 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.BooleanArgument.stringValueOf.stringvalueof001
- * @run main/othervm
+ * @run driver
* nsk.jdi.BooleanArgument.stringValueOf.stringvalueof001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002.java
index 8ff262ea8ce..49c3b23bb7d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -59,7 +59,10 @@ import com.sun.jdi.connect.Connector.BooleanArgument;
public class stringvalueof002 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002/TestDescription.java
index 8ac76a9b1e2..bfefb9f02e7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -76,7 +76,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.BooleanArgument.stringValueOf.stringvalueof002
- * @run main/othervm
+ * @run driver
* nsk.jdi.BooleanArgument.stringValueOf.stringvalueof002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001.java
index 0a3ee9c54fe..92bb93ad15c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class booleantype001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001/TestDescription.java
index e537d1ff1ac..84902ceda9c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.BooleanType._itself_.booleantype001
* nsk.jdi.BooleanType._itself_.booleantype001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BooleanType._itself_.booleantype001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals001.java
index 75f31d07082..6f713873383 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -82,7 +82,9 @@ public class equals001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals001/TestDescription.java
index 6bdce63e02f..8f017d07718 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.BooleanValue.equals.equals001
* nsk.jdi.BooleanValue.equals.equals001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BooleanValue.equals.equals001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals002.java
index fc58d377f7e..c66de44a187 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -60,7 +60,10 @@ public class equals002 {
private static ReferenceType refType;
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals002/TestDescription.java
index 8431c2f1694..0707289ac3f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.BooleanValue.equals.equals002
* nsk.jdi.BooleanValue.equals.equals002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BooleanValue.equals.equals002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/hashCode/hashcode001.java
index 380c40a30c3..3423219d6e3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -80,7 +80,9 @@ public class hashcode001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/hashCode/hashcode001/TestDescription.java
index 28e6c5e8c7a..b9ae4a61cc9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.BooleanValue.hashCode.hashcode001
* nsk.jdi.BooleanValue.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BooleanValue.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/value/value001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/value/value001.java
index 076fb2b8211..cd0a3a1ae62 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/value/value001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/value/value001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -74,7 +74,9 @@ public class value001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/value/value001/TestDescription.java
index 7e1298c71a6..4552fdbf6b1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/value/value001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/value/value001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.BooleanValue.value.value001
* nsk.jdi.BooleanValue.value.value001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BooleanValue.value.value001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001.java
index a947cf9206f..89039659cef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -74,8 +74,11 @@ public class breakpoint001 {
static private volatile boolean methodCompleted;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001/TestDescription.java
index cb221b5c6d5..d4e39feab9b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -80,7 +80,7 @@
* /test/lib
* @build nsk.jdi.BreakpointEvent._itself_.breakpoint001
* nsk.jdi.BreakpointEvent._itself_.breakpoint001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BreakpointEvent._itself_.breakpoint001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint002.java
index b7d3487f83d..26a91bf3d0e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,10 @@ public class breakpoint002 {
private Object gotEvent = new Object();
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint002/TestDescription.java
index 237e3ca07e3..be83d0a18a4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* @clean nsk.jdi.BreakpointEvent._itself_.breakpoint002t
* @compile -g:lines,source,vars ../breakpoint002t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.BreakpointEvent._itself_.breakpoint002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/_bounds_/filters001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/_bounds_/filters001.java
index dea220ec5fb..7df4c542da6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/_bounds_/filters001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/_bounds_/filters001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -60,7 +60,10 @@ public class filters001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/_bounds_/filters001/TestDescription.java
index 5da5b1331c3..e20358c242b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/_bounds_/filters001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/_bounds_/filters001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,7 @@
* /test/lib
* @build nsk.jdi.BreakpointRequest._bounds_.filters001
* nsk.jdi.BreakpointRequest._bounds_.filters001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BreakpointRequest._bounds_.filters001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter001.java
index 4038829a430..4e19ca8dea6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -70,7 +70,10 @@ import java.io.*;
public class instancefilter001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter001/TestDescription.java
index 2e6768174a4..1cf074bf8cc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter001
* nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002.java
index 38cfa8b7c82..e37ee7eacbe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class instancefilter002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002/TestDescription.java
index fd6319eefb6..e33e0bbc53b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter002
* nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003.java
index 4e59735afdb..612792a417b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -83,7 +83,9 @@ public class instancefilter003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003/TestDescription.java
index 39cc429066d..b5483845be0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter003
* nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter004.java
index 922371eeff0..446d5eb8349 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -78,7 +78,10 @@ import java.io.*;
public class instancefilter004 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter004/TestDescription.java
index 7290652a30a..f0ff16c6f8e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -79,7 +79,7 @@
* /test/lib
* @build nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter004
* nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter001.java
index 7205550f17c..5d00cfe1e37 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -65,7 +65,10 @@ import java.io.*;
public class threadfilter001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter001/TestDescription.java
index eac3254a24a..a5553a0c722 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter001
* nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002.java
index b1b588adf11..6d39e3d31c1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -89,7 +89,9 @@ public class threadfilter002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002/TestDescription.java
index 54496e897ee..4f330d31d6a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter002
* nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003.java
index 5c20571ec0a..421ffc26185 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -89,7 +89,9 @@ public class threadfilter003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003/TestDescription.java
index 12c9244c6ab..63c6711bdc0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter003
* nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter004.java
index e4db04d0eb8..f7b1b04ffe3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -74,7 +74,10 @@ import java.io.*;
public class threadfilter004 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter004/TestDescription.java
index c56d2fcd104..5a89922cbc8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter004
* nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001.java
index 413ec6022e5..f2d2de73210 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class location001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001/TestDescription.java
index 56cc3e7cb57..6a5df779263 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.BreakpointRequest.location.location001
* nsk.jdi.BreakpointRequest.location.location001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.BreakpointRequest.location.location001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001.java
index 532e6b0cc74..4c56c75ad13 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class bytetype001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001/TestDescription.java
index 354c5673556..d11558bb9f3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.ByteType._itself_.bytetype001
* nsk.jdi.ByteType._itself_.bytetype001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ByteType._itself_.bytetype001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/compareTo/compareto001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/compareTo/compareto001.java
index 8c897a85cdd..6e83036690a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/compareTo/compareto001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/compareTo/compareto001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -64,7 +64,10 @@ public class compareto001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/compareTo/compareto001/TestDescription.java
index 625a6037bf5..92f7a8b64f1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/compareTo/compareto001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/compareTo/compareto001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.ByteValue.compareTo.compareto001
* nsk.jdi.ByteValue.compareTo.compareto001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ByteValue.compareTo.compareto001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals001.java
index fcdd191261c..206491527ed 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -79,7 +79,9 @@ public class equals001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals001/TestDescription.java
index f59af3bbbe3..f2714b7c7a4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.ByteValue.equals.equals001
* nsk.jdi.ByteValue.equals.equals001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ByteValue.equals.equals001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals002.java
index 62d6862c273..15bd4c835d5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -60,7 +60,10 @@ public class equals002 {
private static ReferenceType refType;
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals002/TestDescription.java
index 2e5c98a984d..3d433784381 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.ByteValue.equals.equals002
* nsk.jdi.ByteValue.equals.equals002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ByteValue.equals.equals002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/hashCode/hashcode001.java
index 5bc3013eb0e..b962a8bab87 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -74,7 +74,9 @@ public class hashcode001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/hashCode/hashcode001/TestDescription.java
index 666ce26a13f..581316fff24 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.ByteValue.hashCode.hashcode001
* nsk.jdi.ByteValue.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ByteValue.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/value/value001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/value/value001.java
index 7e30c7b7169..973659dd44f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/value/value001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/value/value001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -77,7 +77,9 @@ public class value001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/value/value001/TestDescription.java
index 439de1a0213..b4664a6c582 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/value/value001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/value/value001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.ByteValue.value.value001
* nsk.jdi.ByteValue.value.value001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ByteValue.value.value001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001.java
index a69b4dedae7..66579c598b7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class chartype001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001/TestDescription.java
index 9c9ab871aac..e16a3f7bde3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.CharType._itself_.chartype001
* nsk.jdi.CharType._itself_.chartype001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.CharType._itself_.chartype001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/compareTo/compareto001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/compareTo/compareto001.java
index f78a2b79af8..d612ad2cfa9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/compareTo/compareto001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/compareTo/compareto001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -64,7 +64,10 @@ public class compareto001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/compareTo/compareto001/TestDescription.java
index 249a42cb876..47c3ebab241 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/compareTo/compareto001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/compareTo/compareto001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.CharValue.compareTo.compareto001
* nsk.jdi.CharValue.compareTo.compareto001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.CharValue.compareTo.compareto001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals001.java
index 6ce2363cd02..576af425190 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -79,7 +79,9 @@ public class equals001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals001/TestDescription.java
index 2b8a1478f4a..d46dbce4104 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.CharValue.equals.equals001
* nsk.jdi.CharValue.equals.equals001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.CharValue.equals.equals001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals002.java
index 4c027914ebd..2c11f030d7b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -60,7 +60,10 @@ public class equals002 {
private static ReferenceType refType;
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals002/TestDescription.java
index c7f3152eb25..cd879019dff 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.CharValue.equals.equals002
* nsk.jdi.CharValue.equals.equals002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.CharValue.equals.equals002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/hashCode/hashcode001.java
index 94de260db43..3786bc859ac 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -75,7 +75,9 @@ public class hashcode001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/hashCode/hashcode001/TestDescription.java
index 9d6c8a4e250..caa0ee69c31 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.CharValue.hashCode.hashcode001
* nsk.jdi.CharValue.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.CharValue.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/value/value001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/value/value001.java
index 0ad3bcad40d..be1edcf2cd2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/value/value001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/value/value001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -74,7 +74,9 @@ public class value001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/value/value001/TestDescription.java
index fbdf41551ca..001c4996181 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/value/value001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/value/value001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.CharValue.value.value001
* nsk.jdi.CharValue.value.value001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.CharValue.value.value001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001.java
index 7a36464198b..59fc1a0ab11 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class definedclasses001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001/TestDescription.java
index 7ac516a6685..1661b051164 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.ClassLoaderReference.definedClasses.definedclasses001
* nsk.jdi.ClassLoaderReference.definedClasses.definedclasses001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassLoaderReference.definedClasses.definedclasses001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses002.java
index 87d32c47765..8cde794eab1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -62,7 +62,10 @@ public class definedclasses002 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses002/TestDescription.java
index 00b6a818a58..e7f5dca1fc3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.ClassLoaderReference.definedClasses.definedclasses002
* nsk.jdi.ClassLoaderReference.definedClasses.definedclasses002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassLoaderReference.definedClasses.definedclasses002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses003.java
index f9ba74ac466..405ae93c8d2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -65,7 +65,10 @@ public class definedclasses003 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses003/TestDescription.java
index 01e23a722a3..44a44d60b56 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassLoaderReference.definedClasses.definedclasses003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses004.java
index 00b41dc9e51..c9752ef9c06 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -62,7 +62,10 @@ public class definedclasses004 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses004/TestDescription.java
index 8e4ce502038..6033ab8a1d6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.ClassLoaderReference.definedClasses.definedclasses004
* nsk.jdi.ClassLoaderReference.definedClasses.definedclasses004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassLoaderReference.definedClasses.definedclasses004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses005.java
index f7f9f84536b..206a5359cc5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -65,7 +65,10 @@ public class definedclasses005 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses005/TestDescription.java
index 7cf9955f841..82d86e4b871 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassLoaderReference.definedClasses.definedclasses005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001.java
index 2d5ba8a584a..63b6fec010c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -92,7 +92,9 @@ public class visibleclasses001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001/TestDescription.java
index 68ee90e3a39..add6fc79031 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -87,7 +87,7 @@
* /test/lib
* @build nsk.jdi.ClassLoaderReference.visibleClasses.visibleclasses001
* nsk.jdi.ClassLoaderReference.visibleClasses.visibleclasses001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassLoaderReference.visibleClasses.visibleclasses001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses002.java
index 836b3c1ae5f..8fe41faa886 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -62,7 +62,10 @@ public class visibleclasses002 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses002/TestDescription.java
index 7915c6eca2c..b2225f21726 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.ClassLoaderReference.visibleClasses.visibleclasses002
* nsk.jdi.ClassLoaderReference.visibleClasses.visibleclasses002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassLoaderReference.visibleClasses.visibleclasses002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype001.java
index e807eaa15e7..bc093a807ba 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -82,13 +82,13 @@ public class reflectype001 extends Log {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype001/TestDescription.java
index 423bb747a5d..7c0dfd0e82b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.ClassObjectReference.reflectedType.reflectype001
* nsk.jdi.ClassObjectReference.reflectedType.reflectype001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassObjectReference.reflectedType.reflectype001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002.java
index 46608d9b07d..227d67ab4ea 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -50,13 +50,13 @@ public class reflectype002 extends Log {
private final static String checked_class = package_prefix + "reflectype002b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002/TestDescription.java
index 4e3ee545319..20584002f6e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassObjectReference.reflectedType.reflectype002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/toString/tostring001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/toString/tostring001.java
index 0f66d1e01bd..89d2e33ef60 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/toString/tostring001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/toString/tostring001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -83,7 +83,10 @@ public class tostring001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/toString/tostring001/TestDescription.java
index 1abc52e7d66..655b59aedf3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/toString/tostring001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/toString/tostring001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.ClassObjectReference.toString.tostring001
* nsk.jdi.ClassObjectReference.toString.tostring001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassObjectReference.toString.tostring001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001.java
index e576e58be4c..70ad2461817 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -71,8 +71,11 @@ public class refType001 {
static private volatile boolean testFailed, eventsReceived, threadsStarted;
static private int eventTimeout;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001/TestDescription.java
index 854e47d89d2..eaa6c257f8d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -81,7 +81,7 @@
* /test/lib
* @build nsk.jdi.ClassPrepareEvent.referenceType.refType001
* nsk.jdi.ClassPrepareEvent.referenceType.refType001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassPrepareEvent.referenceType.refType001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001.java
index 12bbf21d242..5d9057a55a9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,8 +75,11 @@ public class thread001 {
static private volatile boolean testFailed, eventsReceived, threadsStarted;
static private int eventTimeout;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001/TestDescription.java
index ebff62e188a..cea844bba80 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -78,7 +78,7 @@
* /test/lib
* @build nsk.jdi.ClassPrepareEvent.thread.thread001
* nsk.jdi.ClassPrepareEvent.thread.thread001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassPrepareEvent.thread.thread001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/_bounds_/filters001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/_bounds_/filters001.java
index 911933f6b9d..b2658f35897 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/_bounds_/filters001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/_bounds_/filters001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -59,7 +59,10 @@ public class filters001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/_bounds_/filters001/TestDescription.java
index d575baf91eb..11ffb81ddc2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/_bounds_/filters001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/_bounds_/filters001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -44,7 +44,7 @@
* /test/lib
* @build nsk.jdi.ClassPrepareRequest._bounds_.filters001
* nsk.jdi.ClassPrepareRequest._bounds_.filters001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassPrepareRequest._bounds_.filters001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter001.java
index d684989d4e6..7372f40062a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -62,7 +62,10 @@ import java.io.*;
public class filter001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter001/TestDescription.java
index 068be877845..525b7f1f7a8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.ClassPrepareRequest.addClassExclusionFilter.filter001
* nsk.jdi.ClassPrepareRequest.addClassExclusionFilter.filter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassPrepareRequest.addClassExclusionFilter.filter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter002.java
index 7c0bdb383cf..d12b7682c0f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -62,7 +62,10 @@ import java.io.*;
public class filter002 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter002/TestDescription.java
index 33ebac6f51c..4fe8647ff91 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.ClassPrepareRequest.addClassExclusionFilter.filter002
* nsk.jdi.ClassPrepareRequest.addClassExclusionFilter.filter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassPrepareRequest.addClassExclusionFilter.filter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003.java
index b15e41de7a8..cabaf723c14 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class filter003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003/TestDescription.java
index 2b611a033ee..7b54fb67349 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.ClassPrepareRequest.addClassExclusionFilter.filter003
* nsk.jdi.ClassPrepareRequest.addClassExclusionFilter.filter003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassPrepareRequest.addClassExclusionFilter.filter003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt001.java
index 03075ec0cec..608c636b3e8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,7 +69,10 @@ import java.io.*;
public class filter_rt001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt001/TestDescription.java
index bb809a612f6..94d12f11a4c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.ClassPrepareRequest.addClassFilter_rt.filter_rt001
* nsk.jdi.ClassPrepareRequest.addClassFilter_rt.filter_rt001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassPrepareRequest.addClassFilter_rt.filter_rt001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002.java
index 68ce219eabd..dfaaa176977 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -86,7 +86,9 @@ public class filter_rt002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002/TestDescription.java
index ef7aa08e43a..d08fad98c05 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.ClassPrepareRequest.addClassFilter_rt.filter_rt002
* nsk.jdi.ClassPrepareRequest.addClassFilter_rt.filter_rt002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassPrepareRequest.addClassFilter_rt.filter_rt002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt003.java
index 9836e5928bb..635411c43b9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,7 +75,10 @@ import java.io.*;
public class filter_rt003 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt003/TestDescription.java
index f4e9ef3b464..3ea36a68bc3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -75,7 +75,7 @@
* /test/lib
* @build nsk.jdi.ClassPrepareRequest.addClassFilter_rt.filter_rt003
* nsk.jdi.ClassPrepareRequest.addClassFilter_rt.filter_rt003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassPrepareRequest.addClassFilter_rt.filter_rt003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s001.java
index 937a5ea2531..dd9593b4c34 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,10 @@ import java.io.*;
public class filter_s001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s001/TestDescription.java
index b19be77c961..7860347ec18 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.ClassPrepareRequest.addClassFilter_s.filter_s001
* nsk.jdi.ClassPrepareRequest.addClassFilter_s.filter_s001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassPrepareRequest.addClassFilter_s.filter_s001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002.java
index 2e1b0af494c..c175dff4e2f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class filter_s002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002/TestDescription.java
index 495f7acca5c..258c34cac00 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.ClassPrepareRequest.addClassFilter_s.filter_s002
* nsk.jdi.ClassPrepareRequest.addClassFilter_s.filter_s002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassPrepareRequest.addClassFilter_s.filter_s002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter001/addSourceNameFilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter001/addSourceNameFilter001.java
index 74a55c2bbab..64371ce97ec 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter001/addSourceNameFilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter001/addSourceNameFilter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -49,7 +49,7 @@
* @build nsk.jdi.ClassPrepareRequest.addSourceNameFilter.addSourceNameFilter001.addSourceNameFilter001
* nsk.jdi.ClassPrepareRequest.addSourceNameFilter.addSourceNameFilter001.TestClass2
* nsk.share.jdi.TestClass1
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassPrepareRequest.addSourceNameFilter.addSourceNameFilter001.addSourceNameFilter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -73,7 +73,10 @@ import java.util.*;
public class addSourceNameFilter001 extends TestDebuggerType2 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter002/addSourceNameFilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter002/addSourceNameFilter002.java
index 388cd8431bc..019f50caf6b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter002/addSourceNameFilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter002/addSourceNameFilter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.ClassPrepareRequest.addSourceNameFilter.addSourceNameFilter002.addSourceNameFilter002
* nsk.share.jdi.TestClass1
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassPrepareRequest.addSourceNameFilter.addSourceNameFilter002.addSourceNameFilter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -83,7 +83,10 @@ public class addSourceNameFilter002 extends SDEDebugger {
private static final String DEBUGGEE_MAIN_THREAD = "main";
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces001.java
index 8ecef8ec440..87bcf47ce04 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,7 +69,9 @@ public class allinterfaces001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces001/TestDescription.java
index 3ddaab327af..9d2169cda3c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.ClassType.allInterfaces.allinterfaces001
* nsk.jdi.ClassType.allInterfaces.allinterfaces001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.allInterfaces.allinterfaces001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces002.java
index 2a27de0aadd..f632f3a187a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -64,7 +64,10 @@ public class allinterfaces002 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces002/TestDescription.java
index 51e5aa5a67f..264a73a87cf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.ClassType.allInterfaces.allinterfaces002
* nsk.jdi.ClassType.allInterfaces.allinterfaces002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.allInterfaces.allinterfaces002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method001.java
index 0b2d8565017..bdf5b48834c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class method001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method001/TestDescription.java
index 145c48cb09e..ad7c73a0360 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* /test/lib
* @build nsk.jdi.ClassType.concreteMethodByName.method001
* nsk.jdi.ClassType.concreteMethodByName.method001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.concreteMethodByName.method001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method002.java
index c259aebd988..0bcfd7a820c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -81,7 +81,10 @@ public class method002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method002/TestDescription.java
index 171614437bd..195e15a04d0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -41,7 +41,7 @@
* /test/lib
* @build nsk.jdi.ClassType.concreteMethodByName.method002
* nsk.jdi.ClassType.concreteMethodByName.method002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.concreteMethodByName.method002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces001.java
index 429556ceffe..8826d42da08 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -64,7 +64,9 @@ public class interfaces001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces001/TestDescription.java
index 26cda7fbd03..806ca793344 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.ClassType.interfaces.interfaces001
* nsk.jdi.ClassType.interfaces.interfaces001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.interfaces.interfaces001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces002.java
index 95ee8f19205..ba2464a60b3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -64,7 +64,10 @@ public class interfaces002 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces002/TestDescription.java
index 7121228e4d1..134b5dc34ae 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* /test/lib
* @build nsk.jdi.ClassType.interfaces.interfaces002
* nsk.jdi.ClassType.interfaces.interfaces002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.interfaces.interfaces002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001.java
index d5d6e844430..94a209f6e65 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -83,7 +83,9 @@ public class invokemethod001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001/TestDescription.java
index e8992960c39..30609e2e997 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.ClassType.invokeMethod.invokemethod001
* nsk.jdi.ClassType.invokeMethod.invokemethod001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.invokeMethod.invokemethod001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod002.java
index 41ca6630e17..ede1c4d5e38 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -109,7 +109,10 @@ public class invokemethod002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod002/TestDescription.java
index 95009f544fc..9fa5aaa9122 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* /test/lib
* @build nsk.jdi.ClassType.invokeMethod.invokemethod002
* nsk.jdi.ClassType.invokeMethod.invokemethod002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.invokeMethod.invokemethod002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod003.java
index d51b969e985..74e48fde34a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -87,7 +87,10 @@ public class invokemethod003 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod003/TestDescription.java
index b70c1cc7d87..1743c02e7ef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.ClassType.invokeMethod.invokemethod003
* nsk.jdi.ClassType.invokeMethod.invokemethod003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.invokeMethod.invokemethod003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod004.java
index a2bfcffd5aa..9cccd2bd725 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -83,7 +83,10 @@ public class invokemethod004 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod004/TestDescription.java
index f7a1b3ef75e..890cabee39e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -49,7 +49,7 @@
* /test/lib
* @build nsk.jdi.ClassType.invokeMethod.invokemethod004
* nsk.jdi.ClassType.invokeMethod.invokemethod004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.invokeMethod.invokemethod004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod005.java
index bedc446ec84..25c32e3d493 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -122,7 +122,10 @@ public class invokemethod005 extends ValueConversionDebugger {
}
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod005/TestDescription.java
index 781627e2dbd..cbee69acea9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.ClassType.invokeMethod.invokemethod005
* nsk.jdi.ClassType.invokeMethod.invokemethod005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.invokeMethod.invokemethod005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod006.java
index 494f54f9de9..35c1e55225f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -79,7 +79,10 @@ public class invokemethod006 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod006/TestDescription.java
index 293e3083ddc..52439a060c1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.ClassType.invokeMethod.invokemethod006
* nsk.jdi.ClassType.invokeMethod.invokemethod006a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.invokeMethod.invokemethod006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007.java
index 5df33317b94..0458c6dc91c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -84,7 +84,10 @@ public class invokemethod007 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007/TestDescription.java
index 5f33eaaad16..09bf610d04d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.ClassType.invokeMethod.invokemethod007
* nsk.jdi.ClassType.invokeMethod.invokemethod007a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.invokeMethod.invokemethod007
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod008.java
index 2178bc2e0e2..96eb3956e6b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod008.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -72,7 +72,10 @@ public class invokemethod008 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod008/TestDescription.java
index 046ba89adad..745db408235 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod008/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.ClassType.invokeMethod.invokemethod008
* nsk.jdi.ClassType.invokeMethod.invokemethod008a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.invokeMethod.invokemethod008
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009.java
index 802bf810a3e..6e49b05708d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -83,7 +83,10 @@ public class invokemethod009 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009/TestDescription.java
index 47828168dee..e208d9663c8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,7 @@
* /test/lib
* @build nsk.jdi.ClassType.invokeMethod.invokemethod009
* nsk.jdi.ClassType.invokeMethod.invokemethod009t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.invokeMethod.invokemethod009
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010.java
index 5280d9da008..1053f29411a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -82,7 +82,10 @@ public class invokemethod010 {
private int tot_res = Consts.TEST_PASSED;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010/TestDescription.java
index 34303d74935..551ac6ee942 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -43,7 +43,7 @@
* /test/lib
* @build nsk.jdi.ClassType.invokeMethod.invokemethod010
* nsk.jdi.ClassType.invokeMethod.invokemethod010t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.invokeMethod.invokemethod010
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011.java
index 7d37b279382..60a9bcaffa7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -96,7 +96,10 @@ public class invokemethod011 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011/TestDescription.java
index 4bd7118118f..adb7b99567c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.ClassType.invokeMethod.invokemethod011
* nsk.jdi.ClassType.invokeMethod.invokemethod011t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.invokeMethod.invokemethod011
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012.java
index 4f2159e1c90..a2f6b3cc173 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -102,7 +102,10 @@ public class invokemethod012 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012/TestDescription.java
index 0190103235c..e675bf3c3fc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.ClassType.invokeMethod.invokemethod012
* nsk.jdi.ClassType.invokeMethod.invokemethod012t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.invokeMethod.invokemethod012
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013.java
index a967c2c23ab..8506087c784 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -103,7 +103,10 @@ public class invokemethod013 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013/TestDescription.java
index 7080eea3c83..ed341632008 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.ClassType.invokeMethod.invokemethod013
* nsk.jdi.ClassType.invokeMethod.invokemethod013t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.invokeMethod.invokemethod013
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014.java
index ab5c0ae798f..7bab20f5f5e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -86,7 +86,10 @@ public class invokemethod014 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014/TestDescription.java
index 8a1f8c86570..22b921d8047 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -41,7 +41,7 @@
* /test/lib
* @build nsk.jdi.ClassType.invokeMethod.invokemethod014
* nsk.jdi.ClassType.invokeMethod.invokemethod014t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.invokeMethod.invokemethod014
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod015.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod015.java
index b8cef0b3814..557c5682229 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod015.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod015.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -64,7 +64,10 @@ public class invokemethod015 {
//------------------------------------------------------ immutable common methods
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
//------------------------------------------------------ test specific fields
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod015/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod015/TestDescription.java
index c8c87343a85..8e50426365a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod015/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod015/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.ClassType.invokeMethod.invokemethod015
* nsk.jdi.ClassType.invokeMethod.invokemethod015a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.invokeMethod.invokemethod015
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/isEnum/isenum001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/isEnum/isenum001.java
index 52b9a92241b..fe6e491f65e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/isEnum/isenum001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/isEnum/isenum001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -64,7 +64,10 @@ public class isenum001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/isEnum/isenum001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/isEnum/isenum001/TestDescription.java
index 18b55f74423..3165c5fea84 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/isEnum/isenum001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/isEnum/isenum001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.ClassType.isEnum.isenum001
* nsk.jdi.ClassType.isEnum.isenum001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.isEnum.isenum001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001.java
index a85b18f447b..b36d63c308e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class newinstance001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001/TestDescription.java
index a2050ab8112..f64f36bf54f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -136,7 +136,7 @@
* /test/lib
* @build nsk.jdi.ClassType.newInstance.newinstance001
* nsk.jdi.ClassType.newInstance.newinstance001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.newInstance.newinstance001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002.java
index 4e1816553fa..df33538733e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -83,7 +83,9 @@ public class newinstance002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002/TestDescription.java
index 691a828366f..91673cdf116 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -141,7 +141,7 @@
* @clean nsk.jdi.ClassType.newInstance.newinstance002a
* @compile -g:lines,source,vars ../newinstance002a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.newInstance.newinstance002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance003.java
index 323829e4c19..392ffaa174f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -77,7 +77,10 @@ public class newinstance003 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance003/TestDescription.java
index 679fd323658..01124357358 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.ClassType.newInstance.newinstance003
* nsk.jdi.ClassType.newInstance.newinstance003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.newInstance.newinstance003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance004.java
index 76eb4253c02..ee6195e3fc3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -78,7 +78,10 @@ public class newinstance004 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance004/TestDescription.java
index 61112c73ef3..bb992b74de6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -49,7 +49,7 @@
* /test/lib
* @build nsk.jdi.ClassType.newInstance.newinstance004
* nsk.jdi.ClassType.newInstance.newinstance004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.newInstance.newinstance004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance005.java
index e67364e684c..064fe3f0ba3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -122,7 +122,10 @@ public class newinstance005 extends ValueConversionDebugger {
Short.MAX_VALUE};
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance005/TestDescription.java
index bd9addfdc59..82936d28481 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.ClassType.newInstance.newinstance005
* nsk.jdi.ClassType.newInstance.newinstance005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.newInstance.newinstance005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance006.java
index 80eb364a686..5f4acc61e3b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -79,7 +79,10 @@ public class newinstance006 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance006/TestDescription.java
index 83d540bed32..156057add47 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.ClassType.newInstance.newinstance006
* nsk.jdi.ClassType.newInstance.newinstance006a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.newInstance.newinstance006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007.java
index a7421d1d3d1..7eedc604e75 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -82,7 +82,10 @@ public class newinstance007 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007/TestDescription.java
index 7059331afcb..3d662f6bf3c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.ClassType.newInstance.newinstance007
* nsk.jdi.ClassType.newInstance.newinstance007a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.newInstance.newinstance007
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance008.java
index cf9464af968..5591519c9cf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance008.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -71,7 +71,10 @@ public class newinstance008 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance008/TestDescription.java
index 5877f405097..e8314816259 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance008/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.ClassType.newInstance.newinstance008
* nsk.jdi.ClassType.newInstance.newinstance008a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.newInstance.newinstance008
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009.java
index 36f24f05fed..a29b7cb5d7d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -67,7 +67,10 @@ public class newinstance009 {
private int tot_res = Consts.TEST_PASSED;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009/TestDescription.java
index 28611f81ea3..bfa9876f9fe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -44,7 +44,7 @@
* /test/lib
* @build nsk.jdi.ClassType.newInstance.newinstance009
* nsk.jdi.ClassType.newInstance.newinstance009t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.newInstance.newinstance009
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue001.java
index c106fb9b8f9..d5df9c86190 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -72,7 +72,9 @@ public class setvalue001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue001/TestDescription.java
index 3de790a7e60..3b3829af907 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -87,7 +87,7 @@
* /test/lib
* @build nsk.jdi.ClassType.setValue.setvalue001
* nsk.jdi.ClassType.setValue.setvalue001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.setValue.setvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue002.java
index dcc542e9757..717b06432c9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -83,7 +83,9 @@ public class setvalue002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue002/TestDescription.java
index 75bc9079aaa..b8582257320 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -87,7 +87,7 @@
* /test/lib
* @build nsk.jdi.ClassType.setValue.setvalue002
* nsk.jdi.ClassType.setValue.setvalue002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.setValue.setvalue002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue003.java
index d590f664d7e..87b9d872f14 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,7 +76,9 @@ public class setvalue003 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue003/TestDescription.java
index 40c41ec5359..50f120f0ba4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -86,7 +86,7 @@
* /test/lib
* @build nsk.jdi.ClassType.setValue.setvalue003
* nsk.jdi.ClassType.setValue.setvalue003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.setValue.setvalue003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue004.java
index 5e14fb6fa4b..4cbcc6036dd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -68,7 +68,9 @@ public class setvalue004 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue004/TestDescription.java
index 9b3a23803f4..112e4a79e2f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -87,7 +87,7 @@
* /test/lib
* @build nsk.jdi.ClassType.setValue.setvalue004
* nsk.jdi.ClassType.setValue.setvalue004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.setValue.setvalue004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue005.java
index 2a3d6ae46a7..7d7c3a9a9d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class setvalue005 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue005/TestDescription.java
index 44b38a7c011..b22c095c286 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -85,7 +85,7 @@
* /test/lib
* @build nsk.jdi.ClassType.setValue.setvalue005
* nsk.jdi.ClassType.setValue.setvalue005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.setValue.setvalue005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue006.java
index 9d7786aaab5..b6542162c7e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -73,7 +73,10 @@ public class setvalue006 {
private int tot_res = Consts.TEST_PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue006/TestDescription.java
index 1af1e37acae..f4ad8c99c1d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.ClassType.setValue.setvalue006
* nsk.jdi.ClassType.setValue.setvalue006t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.setValue.setvalue006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue007.java
index a73c984a51b..4395db18ae3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue007.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -96,7 +96,10 @@ public class setvalue007 {
private int tot_res = Consts.TEST_PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue007/TestDescription.java
index f9491c9118b..0d5ae326aad 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue007/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -43,7 +43,7 @@
* /test/lib
* @build nsk.jdi.ClassType.setValue.setvalue007
* nsk.jdi.ClassType.setValue.setvalue007t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.setValue.setvalue007
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue008.java
index afc749836c6..d3a03098a22 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue008.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -65,7 +65,10 @@ public class setvalue008 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue008/TestDescription.java
index 69078b1059b..364c0b6d102 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue008/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.ClassType.setValue.setvalue008
* nsk.jdi.ClassType.setValue.setvalue008a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.setValue.setvalue008
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses001.java
index 6533880fec6..d7e63a61c18 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class subclasses001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses001/TestDescription.java
index de49d6f2d3f..0b5f69a9ba2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.ClassType.subclasses.subclasses001
* nsk.jdi.ClassType.subclasses.subclasses001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.subclasses.subclasses001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses002.java
index 0adb023c29b..773ed13c02e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -64,7 +64,10 @@ public class subclasses002 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses002/TestDescription.java
index 13844b37be8..f393964d6a6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* /test/lib
* @build nsk.jdi.ClassType.subclasses.subclasses002
* nsk.jdi.ClassType.subclasses.subclasses002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.subclasses.subclasses002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass001.java
index d94f8d387a7..1bf03db128f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -68,7 +68,9 @@ public class superclass001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass001/TestDescription.java
index c6e6be00758..f2c5a563b9c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.ClassType.superclass.superclass001
* nsk.jdi.ClassType.superclass.superclass001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.superclass.superclass001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass002.java
index 149494d1615..d90b81fa8d8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -64,7 +64,10 @@ public class superclass002 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass002/TestDescription.java
index d3bf5d09261..119ff887112 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.ClassType.superclass.superclass002
* nsk.jdi.ClassType.superclass.superclass002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassType.superclass.superclass002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001.java
index 77ef71d304f..9530e3aa7e5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,8 +69,11 @@ public class classname001 {
static private boolean testFailed;
static private boolean eventReceived;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001/TestDescription.java
index d727b71745e..c967382ccfd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -84,7 +84,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassUnloadEvent.className.classname001
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001.java
index e3afb2185b9..d821cd7b0cd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,8 +77,11 @@ public class signature001 {
static private boolean eventsReceived;
static private boolean eventForClass, eventForInterface, eventForArray;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001/TestDescription.java
index 8614a46092e..c83d6cdf0f3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -90,7 +90,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassUnloadEvent.classSignature.signature001
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/_bounds_/filters001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/_bounds_/filters001.java
index d95bf7fa8de..e2dfc551a59 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/_bounds_/filters001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/_bounds_/filters001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -59,7 +59,10 @@ public class filters001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/_bounds_/filters001/TestDescription.java
index 8c3c75a7692..e1f0732fbea 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/_bounds_/filters001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/_bounds_/filters001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -43,7 +43,7 @@
* /test/lib
* @build nsk.jdi.ClassUnloadRequest._bounds_.filters001
* nsk.jdi.ClassUnloadRequest._bounds_.filters001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassUnloadRequest._bounds_.filters001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter001.java
index f591d38bbb0..6f5855a7421 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -81,7 +81,10 @@ public class exclfilter001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter002.java
index e4246e271a3..5a1f62dcbb1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -63,7 +63,10 @@ public class exclfilter002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter002/TestDescription.java
index 4cc0cfdf462..2e4fdf0ecb9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -50,7 +50,7 @@
* /test/lib
* @build nsk.jdi.ClassUnloadRequest.addClassExclusionFilter.exclfilter002
* nsk.jdi.ClassUnloadRequest.addClassExclusionFilter.exclfilter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassUnloadRequest.addClassExclusionFilter.exclfilter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter001.java
index c7ed2cbd11b..d096044c1c2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -80,7 +80,10 @@ public class filter001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter002.java
index 1373239735c..be4d682f1a5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -63,7 +63,10 @@ public class filter002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter002/TestDescription.java
index cb236f02a07..f3003b4c631 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -50,7 +50,7 @@
* /test/lib
* @build nsk.jdi.ClassUnloadRequest.addClassFilter.filter002
* nsk.jdi.ClassUnloadRequest.addClassFilter.filter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ClassUnloadRequest.addClassFilter.filter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001.java
index f44a4e7fd51..0b14c629ce8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -55,8 +55,11 @@ public class bounds001 {
log.complain("debugger FAILURE> " + msg + "\n");
}
- public static void main(String args[]) {
- System.exit(run(args,System.out) + Consts.JCK_STATUS_BASE);
+ public static void main(String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String args[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001/TestDescription.java
index 994cbc07495..4b3119b1679 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -42,7 +42,7 @@
* /test/lib
* @build nsk.jdi.Connector._bounds_.bounds001
* nsk.jdi.Connector._bounds_.bounds001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Connector._bounds_.bounds001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001.java
index d2fc7a93870..731f89f75fc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -45,7 +45,10 @@ public class defaultArguments001 {
private static Log log;
public static void main( String argv[] ) {
- System.exit(run(argv, System.out)+95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[],PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001/TestDescription.java
index da6b65f560c..35dee3aa933 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -42,7 +42,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Connector.defaultArguments.defaultArguments001
- * @run main/othervm
+ * @run driver
* nsk.jdi.Connector.defaultArguments.defaultArguments001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002.java
index 1724dc9caa5..e5e6ef6b9cd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -46,7 +46,10 @@ public class defaultArguments002 {
private static Log log;
public static void main( String argv[] ) {
- System.exit(run(argv, System.out)+95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002/TestDescription.java
index 7ef36535476..9d2c3fbf834 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -42,7 +42,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Connector.defaultArguments.defaultArguments002
- * @run main/othervm
+ * @run driver
* nsk.jdi.Connector.defaultArguments.defaultArguments002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003.java
index 5710f9b5eb6..486275ed967 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -45,7 +45,10 @@ public class defaultArguments003 {
private static Log log;
public static void main( String argv[] ) {
- System.exit(run(argv, System.out)+95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[],PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003/TestDescription.java
index bf803da60d4..5b9863313af 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -42,7 +42,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Connector.defaultArguments.defaultArguments003
- * @run main/othervm
+ * @run driver
* nsk.jdi.Connector.defaultArguments.defaultArguments003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001.java
index 21da4644607..6a3bd114718 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -45,7 +45,10 @@ public class description001 {
private static Log log;
public static void main( String argv[] ) {
- System.exit(run(argv, System.out)+95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001/TestDescription.java
index 0343ed32b1d..bb91ed6cf93 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -42,7 +42,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Connector.description.description001
- * @run main/othervm
+ * @run driver
* nsk.jdi.Connector.description.description001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001.java
index a8e3cfb8576..38d43643795 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -44,7 +44,10 @@ public class name001 {
private static Log log;
public static void main( String argv[] ) {
- System.exit(run(argv, System.out)+95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001/TestDescription.java
index 16ed2ff308f..5a379fcabc6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -41,7 +41,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Connector.name.name001
- * @run main/othervm
+ * @run driver
* nsk.jdi.Connector.name.name001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001.java
index a1aa360f1e8..32f5b0a6b63 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -54,7 +54,10 @@ public class tostring001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001/TestDescription.java
index 40b5f4133cb..22fcd84d243 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -43,7 +43,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Connector.toString.tostring001
- * @run main/othervm
+ * @run driver
* nsk.jdi.Connector.toString.tostring001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001.java
index 49386ec9d92..54e3f410cab 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -45,7 +45,10 @@ public class transport001 {
private static Log log;
public static void main( String argv[] ) {
- System.exit(run(argv, System.out)+95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001/TestDescription.java
index a002d442563..48ec8c5d353 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -42,7 +42,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Connector.transport.transport001
- * @run main/othervm
+ * @run driver
* nsk.jdi.Connector.transport.transport001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ConstantField/values001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ConstantField/values001.java
index 7710337fa9e..37caff17aa3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ConstantField/values001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ConstantField/values001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -41,7 +41,10 @@ public class values001 {
private static Log log;
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ConstantField/values001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ConstantField/values001/TestDescription.java
index 43c32201d45..5e78d7b0a93 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ConstantField/values001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ConstantField/values001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,6 +68,6 @@
*
* @library /vmTestbase
* /test/lib
- * @run main/othervm nsk.jdi.ConstantField.values001
+ * @run driver nsk.jdi.ConstantField.values001
*/
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001.java
index 254ac5045ce..c7aa128fa94 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class doubletype001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001/TestDescription.java
index 85d98b6b98c..3571c184d2e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.DoubleType._itself_.doubletype001
* nsk.jdi.DoubleType._itself_.doubletype001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.DoubleType._itself_.doubletype001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/compareTo/compareto001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/compareTo/compareto001.java
index a9e67577690..22e4b2e04ae 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/compareTo/compareto001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/compareTo/compareto001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -64,7 +64,10 @@ public class compareto001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/compareTo/compareto001/TestDescription.java
index d77b6471af4..1c632013e65 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/compareTo/compareto001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/compareTo/compareto001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.DoubleValue.compareTo.compareto001
* nsk.jdi.DoubleValue.compareTo.compareto001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.DoubleValue.compareTo.compareto001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals001.java
index 4451d9905d6..36fccc34c69 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -79,7 +79,9 @@ public class equals001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals001/TestDescription.java
index 3c6bc761875..c0920ea2345 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.DoubleValue.equals.equals001
* nsk.jdi.DoubleValue.equals.equals001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.DoubleValue.equals.equals001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals002.java
index a7949217a8f..8baf81a383d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -60,7 +60,10 @@ public class equals002 {
private static ReferenceType refType;
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals002/TestDescription.java
index ae8b7dab3a5..b5d25c2b72e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.DoubleValue.equals.equals002
* nsk.jdi.DoubleValue.equals.equals002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.DoubleValue.equals.equals002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/hashCode/hashcode001.java
index 9b4074dd72f..83d916fe1c1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -76,7 +76,9 @@ public class hashcode001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/hashCode/hashcode001/TestDescription.java
index f2743beb59b..3d337c02a9d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.DoubleValue.hashCode.hashcode001
* nsk.jdi.DoubleValue.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.DoubleValue.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/value/value001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/value/value001.java
index c50360af783..0b773d8c130 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/value/value001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/value/value001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -95,7 +95,9 @@ public class value001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/value/value001/TestDescription.java
index 4902ba2e472..338de3e40e3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/value/value001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/value/value001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.DoubleValue.value.value001
* nsk.jdi.DoubleValue.value.value001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.DoubleValue.value.value001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event001.java
index 4453127ed96..d6edc8ff9a7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,10 @@ public class event001 {
private Object gotEvent = new Object();
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event001/TestDescription.java
index 57d58d4081f..275a132933d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* /test/lib
* @build nsk.jdi.Event._itself_.event001
* nsk.jdi.Event._itself_.event001t
- * @run main/othervm
+ * @run driver
* nsk.jdi.Event._itself_.event001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event002.java
index 40d81b66bee..347e4080df2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -97,7 +97,10 @@ public class event002 {
private Object gotEvent = new Object();
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event002/TestDescription.java
index 4117d71fd77..514c6c2b73b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* /test/lib
* @build nsk.jdi.Event._itself_.event002
* nsk.jdi.Event._itself_.event002t
- * @run main/othervm
+ * @run driver
* nsk.jdi.Event._itself_.event002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001.java
index 4b9a3f709e9..05f57bffe34 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -69,7 +69,10 @@ public class equals001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001/TestDescription.java
index d85ca45d757..0fae5509f3b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* /test/lib
* @build nsk.jdi.Event.equals.equals001
* nsk.jdi.Event.equals.equals001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Event.equals.equals001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001.java
index 06d0ed11f20..4c15e7cc6bf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -69,7 +69,10 @@ public class hashcode001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001/TestDescription.java
index 9f1429f645b..cad30fd9335 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.Event.hashCode.hashcode001
* nsk.jdi.Event.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Event.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001.java
index 9895ce98faf..c6d7b7292e7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -101,7 +101,9 @@ public class request001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001/TestDescription.java
index 13769572033..37f3750bee4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.Event.request.request001
* nsk.jdi.Event.request.request001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Event.request.request001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001.java
index 860be46422b..11b6e4824fc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -101,7 +101,9 @@ public class nextevent001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001/TestDescription.java
index 214beba896a..237158dd6fc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.EventIterator.nextEvent.nextevent001
* nsk.jdi.EventIterator.nextEvent.nextevent001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventIterator.nextEvent.nextevent001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/hashCode/hashcode001.java
index 9e066b30998..6f1f81bde49 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -64,7 +64,10 @@ public class hashcode001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/hashCode/hashcode001/TestDescription.java
index 41b46659b37..a565043f0be 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.EventQueue.hashCode.hashcode001
* nsk.jdi.EventQueue.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventQueue.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove001.java
index 182b4723143..925dc9261d3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -55,7 +55,10 @@ public class remove001 {
private int tot_res = FAILED;
public static void main(String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove001/TestDescription.java
index 281bbd8ea57..307457e4df5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -41,7 +41,7 @@
* /test/lib
* @build nsk.jdi.EventQueue.remove.remove001
* nsk.jdi.EventQueue.remove.remove001t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventQueue.remove.remove001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove002.java
index 7ebe2fb8b5d..53229f61ece 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -58,7 +58,10 @@ public class remove002 {
private volatile int tot_res = FAILED;
public static void main(String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove002/TestDescription.java
index d372bf63fff..add28c63131 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -41,7 +41,7 @@
* /test/lib
* @build nsk.jdi.EventQueue.remove.remove002
* nsk.jdi.EventQueue.remove.remove002t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventQueue.remove.remove002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove003.java
index 31fe659acad..584a06c0483 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -58,7 +58,10 @@ public class remove003 {
private volatile int tot_res = FAILED;
public static void main(String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove003/TestDescription.java
index 2627aa54035..df4ace519d0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -44,7 +44,7 @@
* /test/lib
* @build nsk.jdi.EventQueue.remove.remove003
* nsk.jdi.EventQueue.remove.remove003t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventQueue.remove.remove003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004.java
index 48370081d74..a5d74ff3d95 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -80,7 +80,9 @@ public class remove004 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004/TestDescription.java
index 8973c475e98..6860a5acc16 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.EventQueue.remove.remove004
* nsk.jdi.EventQueue.remove.remove004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventQueue.remove.remove004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l001.java
index 9a919ccfb1e..f166c24b404 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -55,7 +55,10 @@ public class remove_l001 {
private int tot_res = FAILED;
public static void main(String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l001/TestDescription.java
index 5f4232911fe..2952a406ab5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -43,7 +43,7 @@
* /test/lib
* @build nsk.jdi.EventQueue.remove_l.remove_l001
* nsk.jdi.EventQueue.remove_l.remove_l001t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventQueue.remove_l.remove_l001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l002.java
index bacc33886d6..4c59328dd45 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -58,7 +58,10 @@ public class remove_l002 {
private volatile int tot_res = FAILED;
public static void main(String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l002/TestDescription.java
index 7c37ebbc6e9..20901cb949c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -43,7 +43,7 @@
* /test/lib
* @build nsk.jdi.EventQueue.remove_l.remove_l002
* nsk.jdi.EventQueue.remove_l.remove_l002t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventQueue.remove_l.remove_l002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l003.java
index 04d77fe829e..1c31c8b2467 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -58,7 +58,10 @@ public class remove_l003 {
private volatile int tot_res = FAILED;
public static void main(String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l003/TestDescription.java
index 577c95e8953..8f284b65a0c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.EventQueue.remove_l.remove_l003
* nsk.jdi.EventQueue.remove_l.remove_l003t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventQueue.remove_l.remove_l003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004.java
index 8ecf2654854..056030aab3d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,7 +75,9 @@ public class remove_l004 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004/TestDescription.java
index aed897db6e5..a9038249d41 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.EventQueue.remove_l.remove_l004
* nsk.jdi.EventQueue.remove_l.remove_l004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventQueue.remove_l.remove_l004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005.java
index 2d0ddbfc45d..1eaf6f43fa8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -69,7 +69,10 @@ public class remove_l005 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005/TestDescription.java
index 7334889ff0a..d27f7145927 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,7 @@
* /test/lib
* @build nsk.jdi.EventQueue.remove_l.remove_l005
* nsk.jdi.EventQueue.remove_l.remove_l005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventQueue.remove_l.remove_l005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/_bounds_/eventrequest001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/_bounds_/eventrequest001.java
index 4191640334f..96f5004e020 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/_bounds_/eventrequest001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/_bounds_/eventrequest001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -86,7 +86,10 @@ public class eventrequest001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/_bounds_/eventrequest001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/_bounds_/eventrequest001/TestDescription.java
index 844d6079ae3..27e77adf169 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/_bounds_/eventrequest001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/_bounds_/eventrequest001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* /test/lib
* @build nsk.jdi.EventRequest._bounds_.eventrequest001
* nsk.jdi.EventRequest._bounds_.eventrequest001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequest._bounds_.eventrequest001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java
index 404947071ce..41411b88ac9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class addcountfilter001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001/TestDescription.java
index 49812c1f93d..dd13ae909db 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -76,7 +76,7 @@
* /test/lib
* @build nsk.jdi.EventRequest.addCountFilter.addcountfilter001
* nsk.jdi.EventRequest.addCountFilter.addcountfilter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequest.addCountFilter.addcountfilter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java
index d17d5aaba2e..92e8b14db91 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -95,7 +95,9 @@ public class disable001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001/TestDescription.java
index 3458405326a..6a0ce722d46 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.EventRequest.disable.disable001
* nsk.jdi.EventRequest.disable.disable001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequest.disable.disable001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002.java
index ac62694e13f..2bf6c911e6d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class disable002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002/TestDescription.java
index 13f87379f2f..6cf77856a3f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.EventRequest.disable.disable002
* nsk.jdi.EventRequest.disable.disable002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequest.disable.disable002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable003.java
index c33b23918bd..806e13a14df 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -78,7 +78,10 @@ public class disable003 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable003/TestDescription.java
index e6aa473ed96..755519a4d1d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequest.disable.disable003
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java
index 589e15cd305..109ab148806 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class enable001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001/TestDescription.java
index b63e7c86153..d508c28b825 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.EventRequest.enable.enable001
* nsk.jdi.EventRequest.enable.enable001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequest.enable.enable001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002.java
index fbab0d27c62..f4f9a14ac1d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -83,7 +83,9 @@ public class enable002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002/TestDescription.java
index dfc8d6ce7d9..d83c3a58207 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.EventRequest.enable.enable002
* nsk.jdi.EventRequest.enable.enable002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequest.enable.enable002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001.java
index 291b33fea10..886993a4bb0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class getproperty001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001/TestDescription.java
index 5629cea172f..026d86c0b84 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.EventRequest.getProperty.getproperty001
* nsk.jdi.EventRequest.getProperty.getproperty001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequest.getProperty.getproperty001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001.java
index 5245ce003fb..05756d91327 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -67,7 +67,10 @@ public class hashcode001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001/TestDescription.java
index bff91b9f22e..c4434c2a5f3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.EventRequest.hashCode.hashcode001
* nsk.jdi.EventRequest.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequest.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java
index a634df78b3b..3ef5500e4ab 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class isenabled001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001/TestDescription.java
index 71e74359be1..4d9f5abb40a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.EventRequest.isEnabled.isenabled001
* nsk.jdi.EventRequest.isEnabled.isenabled001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequest.isEnabled.isenabled001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001.java
index 93d4fdae605..fcedeca850b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class putproperty001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001/TestDescription.java
index 1ae244b1f55..1b4b2931df3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.EventRequest.putProperty.putproperty001
* nsk.jdi.EventRequest.putProperty.putproperty001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequest.putProperty.putproperty001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java
index 91002312cd8..1d7c80dfa34 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -81,7 +81,9 @@ public class setenabled001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001/TestDescription.java
index 30b4d0b9a66..fef6bd0464c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.EventRequest.setEnabled.setenabled001
* nsk.jdi.EventRequest.setEnabled.setenabled001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequest.setEnabled.setenabled001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java
index 5c9ef8ac9b9..c7bcfaa47b7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class setenabled002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002/TestDescription.java
index 4020bb1b3e8..48ff2470c91 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.EventRequest.setEnabled.setenabled002
* nsk.jdi.EventRequest.setEnabled.setenabled002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequest.setEnabled.setenabled002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003.java
index 5218654cbf1..8e129027b51 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class setenabled003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003/TestDescription.java
index 5268d6416b6..611c678fe67 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.EventRequest.setEnabled.setenabled003
* nsk.jdi.EventRequest.setEnabled.setenabled003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequest.setEnabled.setenabled003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java
index f58aced259b..e1b315519fd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -86,7 +86,9 @@ public class setsuspendpolicy001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001/TestDescription.java
index 53ce8671397..bd45743aebc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.EventRequest.setSuspendPolicy.setsuspendpolicy001
* nsk.jdi.EventRequest.setSuspendPolicy.setsuspendpolicy001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequest.setSuspendPolicy.setsuspendpolicy001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001.java
index 88cb33232d2..7f927de1577 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -81,7 +81,9 @@ public class suspendpolicy001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001/TestDescription.java
index 290859d22f1..35947bc0764 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.EventRequest.suspendPolicy.suspendpolicy001
* nsk.jdi.EventRequest.suspendPolicy.suspendpolicy001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequest.suspendPolicy.suspendpolicy001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001.java
index 355ab547747..36ade0bcc70 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -68,7 +68,10 @@ public class requests001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001/TestDescription.java
index c8153cff6f8..11daa1aa304 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager._bounds_.requests001
* nsk.jdi.EventRequestManager._bounds_.requests001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager._bounds_.requests001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq001.java
index 85d5762e750..42924240d6b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,10 @@ public class accwtchpreq001 {
private volatile int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq001/TestDescription.java
index f17a9f8b239..7b8f5c52062 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.accessWatchpointRequests.accwtchpreq001
* nsk.jdi.EventRequestManager.accessWatchpointRequests.accwtchpreq001t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.accessWatchpointRequests.accwtchpreq001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002.java
index 5f71b2444ff..f27f6a12e31 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class accwtchpreq002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002/TestDescription.java
index b60fb0dc65c..ac8eed5f72d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.accessWatchpointRequests.accwtchpreq002
* nsk.jdi.EventRequestManager.accessWatchpointRequests.accwtchpreq002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.accessWatchpointRequests.accwtchpreq002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq001.java
index c22163dbf73..652300655b3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -86,7 +86,10 @@ public class breakpreq001 {
private volatile int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq001/TestDescription.java
index 4ff6212bd04..4a20a97ce3f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* @clean nsk.jdi.EventRequestManager.breakpointRequests.breakpreq001t
* @compile -g:lines,source,vars ../breakpreq001t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.breakpointRequests.breakpreq001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002.java
index 20bc83dc77a..4046560e444 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class breakpreq002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002/TestDescription.java
index 4e681c7c83d..f15d56b991e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.breakpointRequests.breakpreq002
* nsk.jdi.EventRequestManager.breakpointRequests.breakpreq002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.breakpointRequests.breakpreq002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq001.java
index 888b2f5ee87..d716681260e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,7 +76,10 @@ public class clsprepreq001 {
private volatile int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq001/TestDescription.java
index 7029a18c786..d0d34514a19 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.classPrepareRequests.clsprepreq001
* nsk.jdi.EventRequestManager.classPrepareRequests.clsprepreq001t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.classPrepareRequests.clsprepreq001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002.java
index b04c00ed665..c9719ba3a54 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class clsprepreq002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002/TestDescription.java
index 464edb2d5b4..dd367304509 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.classPrepareRequests.clsprepreq002
* nsk.jdi.EventRequestManager.classPrepareRequests.clsprepreq002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.classPrepareRequests.clsprepreq002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq001.java
index 7b72ea4a74c..b1df628ed8d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,7 +76,10 @@ public class clsunlreq001 {
private volatile int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq001/TestDescription.java
index 61a77ad0a26..0646880444c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.classUnloadRequests.clsunlreq001
* nsk.jdi.EventRequestManager.classUnloadRequests.clsunlreq001t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.classUnloadRequests.clsunlreq001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002.java
index 911d7913720..b6bc52f154e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class clsunlreq002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002/TestDescription.java
index 7a32f6dab0a..9e752c237a4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.classUnloadRequests.clsunlreq002
* nsk.jdi.EventRequestManager.classUnloadRequests.clsunlreq002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.classUnloadRequests.clsunlreq002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq002.java
index 47df213bf33..4074c9f8594 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -54,7 +54,10 @@ public class craccwtchpreq002 {
private Debugee debuggee;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq002/TestDescription.java
index e3f9b512a42..db685bfdbfe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -42,7 +42,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createAccessWatchpointRequest.craccwtchpreq002
* nsk.jdi.EventRequestManager.createAccessWatchpointRequest.craccwtchpreq002t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createAccessWatchpointRequest.craccwtchpreq002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003.java
index 62084b0753c..2be4f8afc9d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class craccwtchpreq003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003/TestDescription.java
index cb305738617..dfef5339646 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createAccessWatchpointRequest.craccwtchpreq003
* nsk.jdi.EventRequestManager.createAccessWatchpointRequest.craccwtchpreq003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createAccessWatchpointRequest.craccwtchpreq003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq002.java
index 98dacc92e17..b2345b47648 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -54,7 +54,10 @@ public class crbreakpreq002 {
private Debugee debuggee;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq002/TestDescription.java
index 2435b95ecc5..290dd6deeaa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -37,7 +37,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createBreakpointRequest.crbreakpreq002
* nsk.jdi.EventRequestManager.createBreakpointRequest.crbreakpreq002t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createBreakpointRequest.crbreakpreq002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003.java
index 60e2efc4194..610a691b269 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class crbreakpreq003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003/TestDescription.java
index f24d6c062f8..5e1aa4bdff6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createBreakpointRequest.crbreakpreq003
* nsk.jdi.EventRequestManager.createBreakpointRequest.crbreakpreq003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createBreakpointRequest.crbreakpreq003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001.java
index 3ae793cb46d..dd0848af06c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -80,7 +80,9 @@ public class cpreg001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001/TestDescription.java
index 048fae3438e..729e4ba02a2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createClassPrepareRequest.cpreg001
* nsk.jdi.EventRequestManager.createClassPrepareRequest.cpreg001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createClassPrepareRequest.cpreg001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001.java
index 706308240e3..bba4427d531 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -80,7 +80,9 @@ public class cureg001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001/TestDescription.java
index 41dea82642b..6137730f2a2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createClassUnloadRequest.cureg001
* nsk.jdi.EventRequestManager.createClassUnloadRequest.cureg001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createClassUnloadRequest.cureg001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009.java
index e720efa0595..4ba4bba13a3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -83,7 +83,9 @@ public class crexreq009 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009/TestDescription.java
index 2471a469d89..082bf76cd8f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -75,7 +75,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createExceptionRequest.crexreq009
* nsk.jdi.EventRequestManager.createExceptionRequest.crexreq009a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createExceptionRequest.crexreq009
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010.java
index e3cccc2a0e7..6d466265ddf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class crexreq010 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010/TestDescription.java
index d8d519c2ea0..4cdc6566593 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -81,7 +81,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createExceptionRequest.crexreq010
* nsk.jdi.EventRequestManager.createExceptionRequest.crexreq010a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createExceptionRequest.crexreq010
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001.java
index f176e4e3a12..e744ec1e8f8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -80,7 +80,9 @@ public class menreg001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001/TestDescription.java
index 05e44f932fd..9628ef404ee 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createMethodEntryRequest.menreg001
* nsk.jdi.EventRequestManager.createMethodEntryRequest.menreg001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createMethodEntryRequest.menreg001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001.java
index 6f9f01cfe45..9d107ee60b0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -80,7 +80,9 @@ public class mexreg001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001/TestDescription.java
index 212cb1e2428..a1e5ec35b15 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createMethodExitRequest.mexreg001
* nsk.jdi.EventRequestManager.createMethodExitRequest.mexreg001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createMethodExitRequest.mexreg001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq002.java
index 2a0c4899701..019bf92f4a6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -54,7 +54,10 @@ public class crmodwtchpreq002 {
private Debugee debuggee;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq002/TestDescription.java
index fc1436736c5..93f99abf974 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -42,7 +42,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createModificationWatchpointRequest.crmodwtchpreq002
* nsk.jdi.EventRequestManager.createModificationWatchpointRequest.crmodwtchpreq002t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createModificationWatchpointRequest.crmodwtchpreq002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003.java
index 7a2019232d0..24198633580 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class crmodwtchpreq003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003/TestDescription.java
index f9cc8850786..e95e859436f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createModificationWatchpointRequest.crmodwtchpreq003
* nsk.jdi.EventRequestManager.createModificationWatchpointRequest.crmodwtchpreq003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createModificationWatchpointRequest.crmodwtchpreq003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001.java
index e3553df154a..a5c5c88b8fd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -72,7 +72,10 @@ public class crstepreq001 {
private int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001/TestDescription.java
index bcb31165ad8..39eadbffa84 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -40,7 +40,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq001
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq001t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002.java
index 55a72a6951a..da62eaea146 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class crstepreq002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002/TestDescription.java
index bfc03683173..e20fa297333 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -79,7 +79,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq002
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003.java
index 7ad725d5ab4..129d9470730 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -69,7 +69,10 @@ public class crstepreq003 {
//------------------------------------------------------ immutable common methods
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + PASS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
//------------------------------------------------------ test specific fields
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003/TestDescription.java
index 37e8b7548cf..97797105065 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq003
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004.java
index d8e36c6e47d..24305ec29f2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -69,7 +69,10 @@ public class crstepreq004 {
//------------------------------------------------------ immutable common methods
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + PASS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
//------------------------------------------------------ test specific fields
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004/TestDescription.java
index 990457cf020..9bcd0d06c62 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq004
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005.java
index 24294f0c0b9..b8f2f17a4ba 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -70,7 +70,10 @@ public class crstepreq005 {
//------------------------------------------------------ immutable common methods
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + PASS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
//------------------------------------------------------ test specific fields
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005/TestDescription.java
index 44245b5aa01..e8c1809dec5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq005
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006.java
index d7b0d1c0aff..0b568ef91b0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -70,7 +70,10 @@ public class crstepreq006 {
//------------------------------------------------------ immutable common methods
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + PASS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
//------------------------------------------------------ test specific fields
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006/TestDescription.java
index 0529aa4daa3..00f5b29388b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq006
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq006a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007.java
index 9706d1cb8b6..dc959612f60 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -70,7 +70,10 @@ public class crstepreq007 {
//------------------------------------------------------ immutable common methods
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + PASS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
//------------------------------------------------------ test specific fields
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007/TestDescription.java
index a0bb36637fd..561e3fd5580 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq007
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq007a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq007
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008.java
index 22e492aa35d..02fa173fcde 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -70,7 +70,10 @@ public class crstepreq008 {
//------------------------------------------------------ immutable common methods
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + PASS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
//------------------------------------------------------ test specific fields
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008/TestDescription.java
index b9062cc3af2..66f744debf8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq008
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq008a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq008
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009.java
index 2f8e722dd5f..55d5d4eb15d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -70,7 +70,10 @@ public class crstepreq009 {
//------------------------------------------------------ immutable common methods
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + PASS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
//------------------------------------------------------ test specific fields
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009/TestDescription.java
index 3d93f02ac21..92a997a0b3d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq009
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq009a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq009
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010.java
index 627f0f0a5bb..694123f9153 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -70,7 +70,10 @@ public class crstepreq010 {
//------------------------------------------------------ immutable common methods
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + PASS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
//------------------------------------------------------ test specific fields
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010/TestDescription.java
index 9e449d71310..793141637a1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq010
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq010a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createStepRequest.crstepreq010
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001.java
index 93a4fd4c507..5c650112f56 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -80,7 +80,9 @@ public class tdreg001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001/TestDescription.java
index 81d763c4a4b..bba4b677ff2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createThreadDeathRequest.tdreg001
* nsk.jdi.EventRequestManager.createThreadDeathRequest.tdreg001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createThreadDeathRequest.tdreg001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001.java
index 63e1c2b5b22..8b594d43285 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -80,7 +80,9 @@ public class tsreg001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001/TestDescription.java
index 6b9693ea7bd..4c1cb48ff06 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createThreadStartRequest.tsreg001
* nsk.jdi.EventRequestManager.createThreadStartRequest.tsreg001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createThreadStartRequest.tsreg001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001.java
index 03ca620d431..dcc5c1b680c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class vmdreg001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001/TestDescription.java
index 2626d595648..400229e060d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.createVMDeathRequest.vmdreg001
* nsk.jdi.EventRequestManager.createVMDeathRequest.vmdreg001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.createVMDeathRequest.vmdreg001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002.java
index 8799579c5cb..072277425cc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -81,7 +81,9 @@ public class delallbreakp002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002/TestDescription.java
index 8cea59cccfb..8fe135bdad9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.deleteAllBreakpoints.delallbreakp002
* nsk.jdi.EventRequestManager.deleteAllBreakpoints.delallbreakp002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.deleteAllBreakpoints.delallbreakp002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002.java
index 38a3623a697..9cfafaea23e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,9 @@ public class delevtreq002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002/TestDescription.java
index 3df9bc5d5b5..4dc8445f718 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -76,7 +76,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.deleteEventRequest.delevtreq002
* nsk.jdi.EventRequestManager.deleteEventRequest.delevtreq002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.deleteEventRequest.delevtreq002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq003.java
index ec150daeada..4625dbba7c1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -75,7 +75,10 @@ public class delevtreq003 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq003/TestDescription.java
index 6c7223b4749..a48001ecadc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.deleteEventRequest.delevtreq003
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002.java
index efcdbfd84ac..8a53a91e8e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class delevtreqs002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002/TestDescription.java
index ed5e199ed27..b32c2226151 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.deleteEventRequests.delevtreqs002
* nsk.jdi.EventRequestManager.deleteEventRequests.delevtreqs002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.deleteEventRequests.delevtreqs002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq001.java
index c0916034e80..2bd143fe35c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,10 @@ public class excreq001 {
private volatile int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq001/TestDescription.java
index 247b78e15ab..bc467a332e2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* @clean nsk.jdi.EventRequestManager.exceptionRequests.excreq001a
* @compile -g:lines,source,vars ../excreq001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.exceptionRequests.excreq001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002.java
index 93cbd6aea57..7c59958fb89 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class excreq002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002/TestDescription.java
index a595029856e..75ecbf18110 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.exceptionRequests.excreq002
* nsk.jdi.EventRequestManager.exceptionRequests.excreq002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.exceptionRequests.excreq002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/hashCode/hashcode001.java
index dbbb475b031..a99469cb805 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -64,7 +64,10 @@ public class hashcode001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/hashCode/hashcode001/TestDescription.java
index a8bd77cfecc..4434098f607 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.hashCode.hashcode001
* nsk.jdi.EventRequestManager.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq001.java
index ca8c0e1fbe7..bf2400351cb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,7 +76,10 @@ public class methentreq001 {
private volatile int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq001/TestDescription.java
index cb92ed958b4..4f095e50c57 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.methodEntryRequests.methentreq001
* nsk.jdi.EventRequestManager.methodEntryRequests.methentreq001t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.methodEntryRequests.methentreq001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002.java
index ffe30fbf739..2b37b6e47fa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class methentreq002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002/TestDescription.java
index c8168655a6b..21a31c09399 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.methodEntryRequests.methentreq002
* nsk.jdi.EventRequestManager.methodEntryRequests.methentreq002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.methodEntryRequests.methentreq002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq001.java
index d6852a0b5cb..7cee0b12884 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,7 +76,10 @@ public class methexitreq001 {
private volatile int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq001/TestDescription.java
index 0fdd10c6941..2765273cec7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.methodExitRequests.methexitreq001
* nsk.jdi.EventRequestManager.methodExitRequests.methexitreq001t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.methodExitRequests.methexitreq001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002.java
index 7ac37682ab9..e63a1cd4349 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class methexitreq002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002/TestDescription.java
index 19b62942eae..ed979f5a442 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.methodExitRequests.methexitreq002
* nsk.jdi.EventRequestManager.methodExitRequests.methexitreq002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.methodExitRequests.methexitreq002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq001.java
index 0fe9d65972e..9f0f65f8441 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,10 @@ public class modwtchpreq001 {
private volatile int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq001/TestDescription.java
index bd4b6898ee8..ff679907bd9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.modificationWatchpointRequests.modwtchpreq001
* nsk.jdi.EventRequestManager.modificationWatchpointRequests.modwtchpreq001t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.modificationWatchpointRequests.modwtchpreq001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002.java
index 130ebfdad69..fe60b2c3963 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class modwtchpreq002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002/TestDescription.java
index 09979b81650..072a1e2fff9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.modificationWatchpointRequests.modwtchpreq002
* nsk.jdi.EventRequestManager.modificationWatchpointRequests.modwtchpreq002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.modificationWatchpointRequests.modwtchpreq002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001.java
index d7993362074..d6047e69994 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -89,7 +89,10 @@ public class stepreq001 {
private volatile int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001/TestDescription.java
index 2cd10995acc..a95b34f511d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.stepRequests.stepreq001
* nsk.jdi.EventRequestManager.stepRequests.stepreq001t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.stepRequests.stepreq001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002.java
index c55c96d9e65..b4354995389 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class stepreq002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002/TestDescription.java
index e50107c1398..9d3704314d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.stepRequests.stepreq002
* nsk.jdi.EventRequestManager.stepRequests.stepreq002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.stepRequests.stepreq002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq001.java
index 7b0c0095b03..dc35af74955 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,7 +75,10 @@ public class thrdeathreq001 {
private volatile int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq001/TestDescription.java
index 7fb6d32608b..c010825fe28 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.threadDeathRequests.thrdeathreq001
* nsk.jdi.EventRequestManager.threadDeathRequests.thrdeathreq001t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.threadDeathRequests.thrdeathreq001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002.java
index ca79baf8549..ab46a848c8e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class thrdeathreq002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002/TestDescription.java
index 537ba135f33..42fe6b24bd4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.threadDeathRequests.thrdeathreq002
* nsk.jdi.EventRequestManager.threadDeathRequests.thrdeathreq002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.threadDeathRequests.thrdeathreq002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq001.java
index c76b805bea9..7866547177f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,7 +75,10 @@ public class thrstartreq001 {
private volatile int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq001/TestDescription.java
index b636602e0fe..65a02b0e148 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.threadStartRequests.thrstartreq001
* nsk.jdi.EventRequestManager.threadStartRequests.thrstartreq001t
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.threadStartRequests.thrstartreq001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002.java
index df1bceeba17..29d69b3174c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class thrstartreq002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002/TestDescription.java
index 3ec25265d62..c386bcd7c5e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.threadStartRequests.thrstartreq002
* nsk.jdi.EventRequestManager.threadStartRequests.thrstartreq002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.threadStartRequests.thrstartreq002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001.java
index 4772c770ff9..7f839dcc192 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class vmdeathreq001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001/TestDescription.java
index fb044b3f06b..77057405ab0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.EventRequestManager.vmDeathRequests.vmdeathreq001
* nsk.jdi.EventRequestManager.vmDeathRequests.vmdeathreq001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventRequestManager.vmDeathRequests.vmdeathreq001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001.java
index 8f151c7d483..f16ab02ddfe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,7 +77,9 @@ public class eventiterator001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001/TestDescription.java
index b56cb3a066d..ecb275dfae4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.EventSet.eventIterator.eventiterator001
* nsk.jdi.EventSet.eventIterator.eventiterator001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.eventIterator.eventiterator001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002.java
index cf317355206..e0a32aa0aa2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -83,7 +83,9 @@ public class eventiterator002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002/TestDescription.java
index 0a32592f34d..700fd6a6e3e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.EventSet.eventIterator.eventiterator002
* nsk.jdi.EventSet.eventIterator.eventiterator002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.eventIterator.eventiterator002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003.java
index 8178e6e26e2..323dea95fe7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -80,7 +80,9 @@ public class eventiterator003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003/TestDescription.java
index a03c62e5607..ea44b1d0c43 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.EventSet.eventIterator.eventiterator003
* nsk.jdi.EventSet.eventIterator.eventiterator003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.eventIterator.eventiterator003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004.java
index 79c1063765f..084db7b6676 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -71,7 +71,9 @@ public class eventiterator004 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004/TestDescription.java
index 5d7e9950c72..a534179fd83 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.EventSet.eventIterator.eventiterator004
* nsk.jdi.EventSet.eventIterator.eventiterator004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.eventIterator.eventiterator004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001.java
index 1a6697271c6..111956171e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,7 +75,10 @@ import static nsk.share.Consts.TEST_FAILED;
public class resume001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001/TestDescription.java
index cd2acbfbae4..5c86dc74fbc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.EventSet.resume.resume001
* nsk.jdi.EventSet.resume.resume001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.resume.resume001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002.java
index a2920fc6e84..09bcb91cbdd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -91,7 +91,9 @@ public class resume002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002/TestDescription.java
index a9de17022eb..5d79a05338e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.EventSet.resume.resume002
* nsk.jdi.EventSet.resume.resume002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.resume.resume002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003.java
index 0026577befb..3ea05a0c7d9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -91,7 +91,9 @@ public class resume003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003/TestDescription.java
index e67be3c2773..d19aff7885e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.EventSet.resume.resume003
* nsk.jdi.EventSet.resume.resume003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.resume.resume003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004.java
index 3757e7dab47..413309e92ad 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -91,7 +91,9 @@ public class resume004 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004/TestDescription.java
index e6aa801341a..d0c405c19e8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.EventSet.resume.resume004
* nsk.jdi.EventSet.resume.resume004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.resume.resume004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005.java
index e72ac3f2956..13e0344dd3f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -91,7 +91,9 @@ public class resume005 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005/TestDescription.java
index 27ceb0eadb2..eef8e00a5d4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.EventSet.resume.resume005
* nsk.jdi.EventSet.resume.resume005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.resume.resume005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006.java
index 3919bac23f0..ef87bba8a0d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -91,7 +91,9 @@ public class resume006 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006/TestDescription.java
index 2bb6bbad9aa..67536af919a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.EventSet.resume.resume006
* nsk.jdi.EventSet.resume.resume006a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.resume.resume006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007.java
index 5ca1b3be36d..235fe36c35c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -91,7 +91,9 @@ public class resume007 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007/TestDescription.java
index 4c705eba419..61239470b7d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.EventSet.resume.resume007
* nsk.jdi.EventSet.resume.resume007a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.resume.resume007
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008.java
index 977a55b668c..bb804a3ac8c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,7 +76,10 @@ public class resume008 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008/TestDescription.java
index 84fcb82cbbe..3a331640279 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.EventSet.resume.resume008
* nsk.jdi.EventSet.resume.resume008a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.resume.resume008
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009.java
index 5ab5c979474..16fc95d22e9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,7 +75,10 @@ import static nsk.share.Consts.TEST_FAILED;
public class resume009 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009/TestDescription.java
index 978b5c99e00..bd8e7cf0977 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.EventSet.resume.resume009
* nsk.jdi.EventSet.resume.resume009a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.resume.resume009
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010.java
index daa904f75da..d49e0c516a3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -91,7 +91,9 @@ public class resume010 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010/TestDescription.java
index 570f48b4997..15abd8db247 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.EventSet.resume.resume010
* nsk.jdi.EventSet.resume.resume010a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.resume.resume010
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011.java
index 0898ce7ed55..fb9c1e6fde4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,7 +75,9 @@ public class resume011 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011/TestDescription.java
index b864c496b48..6da987f0fbe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.EventSet.resume.resume011
* nsk.jdi.EventSet.resume.resume011a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.resume.resume011
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012.java
index 3b9ed63ca8d..3d153675ee8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,7 +76,9 @@ public class resume012 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012/TestDescription.java
index 74546d7885b..7ce024ea80a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.EventSet.resume.resume012
* nsk.jdi.EventSet.resume.resume012a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.resume.resume012
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013.java
index d9fab2da573..d1fc3cb68bb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,7 +76,9 @@ public class resume013 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013/TestDescription.java
index d1a02350b88..6d8f7e91c49 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.EventSet.resume.resume013
* nsk.jdi.EventSet.resume.resume013a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.resume.resume013
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001.java
index 04dfaca5bc4..dd51b0d0390 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -89,7 +89,9 @@ public class suspendpolicy001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001/TestDescription.java
index 3da281f363d..0feef0a1bf0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy001
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002.java
index 4bb8b6a19e9..01be6ad55c4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,9 @@ public class suspendpolicy002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002/TestDescription.java
index 33ec89398d2..fc9df033afd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy002
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003.java
index 34ec4db5723..522d6019f25 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,9 @@ public class suspendpolicy003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003/TestDescription.java
index 0ecb087d5da..3fd01321849 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy003
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004.java
index c8158e56551..cddb7ace5b0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,9 @@ public class suspendpolicy004 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004/TestDescription.java
index 25e168c2670..37fabccfb6a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy004
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005.java
index b57038634df..9d0c7604aba 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,9 @@ public class suspendpolicy005 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005/TestDescription.java
index 3a823d43c88..22dd3fa6c5c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy005
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006.java
index b7778abcef1..068dd94eead 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -86,7 +86,9 @@ public class suspendpolicy006 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006/TestDescription.java
index 8931ffcefe3..ab84136df92 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy006
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy006a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007.java
index da60e2c670c..4601a0039fa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -86,7 +86,9 @@ public class suspendpolicy007 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007/TestDescription.java
index 43c2f9a4d45..8b2fb6f7cc1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy007
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy007a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy007
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008.java
index e0257fcac50..d507d8c6a38 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -86,7 +86,9 @@ public class suspendpolicy008 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008/TestDescription.java
index 0a3f4fc5893..7163058f528 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy008
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy008a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy008
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009.java
index 8a31bd57faa..ca284271be8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -86,7 +86,9 @@ public class suspendpolicy009 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009/TestDescription.java
index 3f9802866fd..9ed566ebfcb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy009
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy009a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy009
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010.java
index f7b2fd4cae9..ec015576277 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class suspendpolicy010 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010/TestDescription.java
index be44b97f4d2..5c79cf99f44 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy010
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy010a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy010
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011.java
index 04c32dbbd16..03d7677c0fb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class suspendpolicy011 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011/TestDescription.java
index 4cc960c2050..7eb95af0b34 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy011
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy011a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy011
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012.java
index a52f70705ef..bb5488d9eb6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class suspendpolicy012 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012/TestDescription.java
index 6e12c6370af..c9193551901 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy012
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy012a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy012
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013.java
index 9576413d012..d78655d1b2a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class suspendpolicy013 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013/TestDescription.java
index f71ad444a22..37c0bd17176 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy013
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy013a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy013
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014.java
index 2796d77dc15..511dc1ddcc1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class suspendpolicy014 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014/TestDescription.java
index 69e60253836..c8894b1a14d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy014
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy014a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy014
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015.java
index 58143790d41..a3961c1d005 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class suspendpolicy015 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015/TestDescription.java
index 1ff1967c2ea..653248238c6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy015
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy015a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy015
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016.java
index 2f185dbd5d6..0b6257f34ef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class suspendpolicy016 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016/TestDescription.java
index cd37c890b3f..32fd7476d34 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy016
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy016a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy016
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017.java
index 11429123362..c7589574ee5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class suspendpolicy017 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017/TestDescription.java
index c03d145d299..52986b65872 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy017
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy017a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy017
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy018.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy018.java
index ba80a93cba0..77faa2df363 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy018.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy018.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class suspendpolicy018 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy018/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy018/TestDescription.java
index 01e0ee83a12..395bf5f2951 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy018/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy018/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy018
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy018a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.suspendPolicy.suspendpolicy018
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/toString/tostring001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/toString/tostring001.java
index f5a56217b9f..d70573d1205 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/toString/tostring001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/toString/tostring001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -63,7 +63,10 @@ public class tostring001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/toString/tostring001/TestDescription.java
index 9a6f154c8e1..2d1da0233a4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/toString/tostring001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/toString/tostring001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.EventSet.toString.tostring001
* nsk.jdi.EventSet.toString.tostring001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.toString.tostring001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/virtualMachine/virtualmachine001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/virtualMachine/virtualmachine001.java
index 3b60be91ee9..444e232251c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/virtualMachine/virtualmachine001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/virtualMachine/virtualmachine001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -62,7 +62,10 @@ public class virtualmachine001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/virtualMachine/virtualmachine001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/virtualMachine/virtualmachine001/TestDescription.java
index 9827fff1c3d..8621940f074 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/virtualMachine/virtualmachine001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/virtualMachine/virtualmachine001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* /test/lib
* @build nsk.jdi.EventSet.virtualMachine.virtualmachine001
* nsk.jdi.EventSet.virtualMachine.virtualmachine001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.EventSet.virtualMachine.virtualmachine001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent001.java
index 80e261b45c2..d0f9bd0a9fc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -87,7 +87,10 @@ public class exevent001 {
private volatile int totalRes = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE); // JCK-style exit status.
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ } // JCK-style exit status.
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent001/TestDescription.java
index b9454a4137b..8bf4eac8659 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* /test/lib
* @build nsk.jdi.ExceptionEvent._itself_.exevent001
* nsk.jdi.ExceptionEvent._itself_.exevent001t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionEvent._itself_.exevent001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent002.java
index add38110b0c..9034348aa83 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -77,7 +77,10 @@ public class exevent002 {
private volatile int totalRes = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE); // JCK-style exit status.
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ } // JCK-style exit status.
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent002/TestDescription.java
index 13935fa95ac..e437a4331d7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.ExceptionEvent._itself_.exevent002
* nsk.jdi.ExceptionEvent._itself_.exevent002t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionEvent._itself_.exevent002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent003.java
index cc38cd69580..7125fe58cf7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -77,7 +77,10 @@ public class exevent003 {
private volatile int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE); // JCK-style exit status.
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ } // JCK-style exit status.
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent003/TestDescription.java
index 873d6fe70f0..18ed885d1ce 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.ExceptionEvent._itself_.exevent003
* nsk.jdi.ExceptionEvent._itself_.exevent003t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionEvent._itself_.exevent003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent004.java
index 85d0e31982d..35158ebf9f2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -79,7 +79,10 @@ public class exevent004 {
private volatile int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE); // JCK-style exit status.
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ } // JCK-style exit status.
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent004/TestDescription.java
index a265347801e..a9219ef89ab 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.ExceptionEvent._itself_.exevent004
* nsk.jdi.ExceptionEvent._itself_.exevent004t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionEvent._itself_.exevent004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent005.java
index 12087f79495..a22d758228e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -79,7 +79,10 @@ public class exevent005 {
private volatile int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE); // JCK-style exit status.
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ } // JCK-style exit status.
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent005/TestDescription.java
index b9636792629..03e51569ec3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.ExceptionEvent._itself_.exevent005
* nsk.jdi.ExceptionEvent._itself_.exevent005t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionEvent._itself_.exevent005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent006.java
index 9ead1af3517..2abac64f4bd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -80,7 +80,10 @@ public class exevent006 {
private volatile int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE); // JCK-style exit status.
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ } // JCK-style exit status.
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent006/TestDescription.java
index 75607e3bab2..710d6cfec7d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.ExceptionEvent._itself_.exevent006
* nsk.jdi.ExceptionEvent._itself_.exevent006t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionEvent._itself_.exevent006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent007.java
index 06f2b698e7d..60c06310053 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent007.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -80,7 +80,10 @@ public class exevent007 {
private volatile int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE); // JCK-style exit status.
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ } // JCK-style exit status.
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent007/TestDescription.java
index 35db29c6983..cba6fbe07f3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent007/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.ExceptionEvent._itself_.exevent007
* nsk.jdi.ExceptionEvent._itself_.exevent007t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionEvent._itself_.exevent007
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008.java
index 51ea853676a..ffd217b31bc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -84,7 +84,10 @@ public class exevent008 {
private volatile int tot_res = PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE); // JCK-style exit status.
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ } // JCK-style exit status.
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008/TestDescription.java
index c3291b2845f..62cb27abb1c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* /test/lib
* @build nsk.jdi.ExceptionEvent._itself_.exevent008
* nsk.jdi.ExceptionEvent._itself_.exevent008t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionEvent._itself_.exevent008
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001.java
index 1d18901dcda..ef1e9e1a919 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -98,8 +98,11 @@ public class location001 {
static private volatile boolean exceptionsThrown;
// execute test from command line
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
// execute test from JCK-compatible harness
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001/TestDescription.java
index 90e00e491eb..311ac21de7a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -73,7 +73,7 @@
* /test/lib
* @build nsk.jdi.ExceptionEvent.catchLocation.location001
* nsk.jdi.ExceptionEvent.catchLocation.location001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionEvent.catchLocation.location001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002.java
index e73874989bc..7c0108fd1f5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -78,8 +78,11 @@ public class location002 {
static private boolean testFailed;
// execute test from command line
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
// execute test from JCK-compatible harness
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002/TestDescription.java
index 1fe8faad335..23f4c19c570 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.ExceptionEvent.catchLocation.location002
* nsk.jdi.ExceptionEvent.catchLocation.location002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionEvent.catchLocation.location002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001.java
index f2730bdac18..85d2304d47f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -98,8 +98,11 @@ public class exception001 {
static private volatile boolean exceptionsThrown;
// execute test from command line
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
// execute test from JCK-compatible harness
@@ -450,8 +453,11 @@ public class exception001 {
static private boolean testFailed;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001/TestDescription.java
index 609db99ca33..95fe7c77408 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -78,7 +78,7 @@
* /test/lib
* @build nsk.jdi.ExceptionEvent.exception.exception001
* nsk.jdi.ExceptionEvent.exception.exception001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionEvent.exception.exception001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/_bounds_/filters001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/_bounds_/filters001.java
index e1dfd61b3d8..e02b9a3db4d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/_bounds_/filters001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/_bounds_/filters001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -67,7 +67,10 @@ public class filters001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/_bounds_/filters001/TestDescription.java
index cc69397c1aa..e1c37c5aa2b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/_bounds_/filters001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/_bounds_/filters001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -46,7 +46,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest._bounds_.filters001
* nsk.jdi.ExceptionRequest._bounds_.filters001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest._bounds_.filters001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter001.java
index 37de70bd64c..5fa733ae417 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -65,7 +65,10 @@ import java.io.*;
public class filter001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter001/TestDescription.java
index 4366417aaf7..1fbe94a38db 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.addClassExclusionFilter.filter001
* nsk.jdi.ExceptionRequest.addClassExclusionFilter.filter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.addClassExclusionFilter.filter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002.java
index 0a9e9538870..d0dac294c8b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,9 @@ public class filter002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002/TestDescription.java
index d42b51c867a..3a44a3ccced 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.addClassExclusionFilter.filter002
* nsk.jdi.ExceptionRequest.addClassExclusionFilter.filter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.addClassExclusionFilter.filter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt001.java
index 74d658008e1..7ceecd829d4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,10 @@ import java.io.*;
public class filter_rt001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt001/TestDescription.java
index 73d1508d4c0..ae90c7ea221 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.addClassFilter_rt.filter_rt001
* nsk.jdi.ExceptionRequest.addClassFilter_rt.filter_rt001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.addClassFilter_rt.filter_rt001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002.java
index a5b24ee05bf..c3a39e40d0b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class filter_rt002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002/TestDescription.java
index fce0732e9d6..165444f2a35 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.addClassFilter_rt.filter_rt002
* nsk.jdi.ExceptionRequest.addClassFilter_rt.filter_rt002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.addClassFilter_rt.filter_rt002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt003.java
index 7d2966f93fb..5395a37ed6b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,7 +77,10 @@ import java.io.*;
public class filter_rt003 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt003/TestDescription.java
index 1238df96263..b2e6297c979 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.addClassFilter_rt.filter_rt003
* nsk.jdi.ExceptionRequest.addClassFilter_rt.filter_rt003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.addClassFilter_rt.filter_rt003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s001.java
index e3c48517983..529f0bafd66 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,10 @@ import java.io.*;
public class filter_s001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s001/TestDescription.java
index 771bce79a5d..d199a1e4d2a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.addClassFilter_s.filter_s001
* nsk.jdi.ExceptionRequest.addClassFilter_s.filter_s001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.addClassFilter_s.filter_s001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002.java
index 96524657b78..8fa62d0edfc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class filter_s002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002/TestDescription.java
index 0cbf6b9422d..970a0214cba 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.addClassFilter_s.filter_s002
* nsk.jdi.ExceptionRequest.addClassFilter_s.filter_s002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.addClassFilter_s.filter_s002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter001.java
index 6f0f3b08d3b..6f39be4aafd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -70,7 +70,10 @@ import java.io.*;
public class instancefilter001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter001/TestDescription.java
index 8a65c925c80..361db894272 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter001
* nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002.java
index ff49eb67f49..6f62f5b08d5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class instancefilter002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002/TestDescription.java
index bf2066aeed6..bb493876245 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter002
* nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003.java
index 37a85bd173d..f1e9f6607ff 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -83,7 +83,9 @@ public class instancefilter003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003/TestDescription.java
index c91de7d4f2b..114185c8e22 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter003
* nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter004.java
index c8d5e44b26b..fe8c87c77a4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,7 +76,10 @@ import java.io.*;
public class instancefilter004 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter004/TestDescription.java
index 0d6b530090a..7f2a63d0387 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -79,7 +79,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter004
* nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter001.java
index 36fa79961a8..60020c38c96 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -63,7 +63,10 @@ import java.io.*;
public class threadfilter001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter001/TestDescription.java
index e45dc21e5ec..880d25f044a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter001
* nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002.java
index ed1d16c8572..d641750204c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -90,7 +90,9 @@ public class threadfilter002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002/TestDescription.java
index 61fc72a03a4..5e5940c1f4b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter002
* nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003.java
index 43d4629d2e0..467a66f52fc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -90,7 +90,9 @@ public class threadfilter003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003/TestDescription.java
index 828b85ba743..ae80c7f1161 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter003
* nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter004.java
index 3b84c265867..94e30f1d2db 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -74,7 +74,10 @@ import java.io.*;
public class threadfilter004 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter004/TestDescription.java
index 25212585149..f9141c90bb7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter004
* nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001.java
index ca7731a3463..4c0d1824812 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class exception001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001/TestDescription.java
index 408ed47c7b8..c145a978b65 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.exception.exception001
* nsk.jdi.ExceptionRequest.exception.exception001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.exception.exception001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001.java
index 7e7eca7fbdc..ad747876586 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -83,7 +83,9 @@ public class notifycaught001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001/TestDescription.java
index f4d9177bd96..c7b7f580aeb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.notifyCaught.notifycaught001
* nsk.jdi.ExceptionRequest.notifyCaught.notifycaught001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.notifyCaught.notifycaught001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001.java
index 9287c1da1e8..883e020caa6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -83,7 +83,9 @@ public class notifyuncaught001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001/TestDescription.java
index 647e962c2f9..8289a5b7c8a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.ExceptionRequest.notifyUncaught.notifyuncaught001
* nsk.jdi.ExceptionRequest.notifyUncaught.notifyuncaught001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ExceptionRequest.notifyUncaught.notifyuncaught001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals001.java
index c0a11abe7b5..917f3319e2a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -41,7 +41,10 @@ public class equals001 {
private final static String classToCheckName = prefix + "ClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals001/TestDescription.java
index f1197a55133..b16d7dc1b2e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.Field.equals.equals001
* nsk.jdi.Field.equals.equals001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Field.equals.equals001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals002.java
index 0979c7db846..64c6bf13915 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -164,7 +164,10 @@ public class equals002 {
private final static String debugeeName = debugerName + "a";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals002/TestDescription.java
index 19ac3848dbf..970c8319658 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -41,7 +41,7 @@
* /test/lib
* @build nsk.jdi.Field.equals.equals002
* nsk.jdi.Field.equals.equals002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Field.equals.equals002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals003.java
index fe1bbd5bd76..f006dea819d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -44,7 +44,10 @@ public class equals003 {
private final static String overridenClassName = prefix + "OverridenClass";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals003/TestDescription.java
index 468bf8feaf9..6396906f9e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -50,7 +50,7 @@
* /test/lib
* @build nsk.jdi.Field.equals.equals003
* nsk.jdi.Field.equals.equals003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Field.equals.equals003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals005.java
index f2f92335ca5..57985b5947b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -40,7 +40,10 @@ public class equals005 {
private final static String debugeeName = debugerName + "a";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals005/TestDescription.java
index c0a1142c3f1..2fe034f82d7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -41,7 +41,7 @@
* /test/lib
* @build nsk.jdi.Field.equals.equals005
* nsk.jdi.Field.equals.equals005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Field.equals.equals005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/hashCode/hashcode001.java
index 3f5d99ddaa9..6ef1903da35 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -40,7 +40,10 @@ public class hashcode001 {
private final static String debugeeName = debugerName + "a";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/hashCode/hashcode001/TestDescription.java
index ee491993234..48c087b6894 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -42,7 +42,7 @@
* /test/lib
* @build nsk.jdi.Field.hashCode.hashcode001
* nsk.jdi.Field.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Field.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isEnumConstant/isenumconstant001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isEnumConstant/isenumconstant001.java
index 9218197eab0..9d846ff5b10 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isEnumConstant/isenumconstant001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isEnumConstant/isenumconstant001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -65,7 +65,10 @@ public class isenumconstant001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isEnumConstant/isenumconstant001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isEnumConstant/isenumconstant001/TestDescription.java
index 35216a88617..a6fe5eaddb8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isEnumConstant/isenumconstant001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isEnumConstant/isenumconstant001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.Field.isEnumConstant.isenumconstant001
* nsk.jdi.Field.isEnumConstant.isenumconstant001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Field.isEnumConstant.isenumconstant001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isTransient/istrans001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isTransient/istrans001.java
index ca1fc0aabd7..da9e3d2e16c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isTransient/istrans001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isTransient/istrans001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -272,7 +272,10 @@ public class istrans001 {
private final static String debugeeName = debugerName + "a";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isTransient/istrans001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isTransient/istrans001/TestDescription.java
index 6cff7052d34..1863034b682 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isTransient/istrans001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isTransient/istrans001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -41,7 +41,7 @@
* /test/lib
* @build nsk.jdi.Field.isTransient.istrans001
* nsk.jdi.Field.isTransient.istrans001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Field.isTransient.istrans001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isVolatile/isvol001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isVolatile/isvol001.java
index 10834197c9b..e029bc8f586 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isVolatile/isvol001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isVolatile/isvol001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -263,7 +263,10 @@ public class isvol001 {
private final static String debugeeName = debugerName + "a";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isVolatile/isvol001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isVolatile/isvol001/TestDescription.java
index c17515bef21..e61d98c7cf5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isVolatile/isvol001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isVolatile/isvol001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -41,7 +41,7 @@
* /test/lib
* @build nsk.jdi.Field.isVolatile.isvol001
* nsk.jdi.Field.isVolatile.isvol001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Field.isVolatile.isvol001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type001.java
index 536289d2a4a..b811276e4c6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -60,7 +60,10 @@ public class type001 {
private final static String debugeeName = debugerName + "a";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type001/TestDescription.java
index 2319fe3ca80..aad0e718ea7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -43,7 +43,7 @@
* /test/lib
* @build nsk.jdi.Field.type.type001
* nsk.jdi.Field.type.type001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Field.type.type001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type002.java
index ae816148f29..04dbfd9b4a8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -78,7 +78,10 @@ public class type002 {
private final static String classToChekName = prefix + "type002aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type002/TestDescription.java
index 1174ad03424..1638dba21cc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,7 @@
* /test/lib
* @build nsk.jdi.Field.type.type002
* nsk.jdi.Field.type.type002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Field.type.type002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type003.java
index bab1315ba61..aee0dbe24c7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -41,7 +41,10 @@ public class type003 {
private final static String classToChekName = prefix + "type003aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type003/TestDescription.java
index 382dcc1fb92..157271e1a51 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,7 @@
* /test/lib
* @build nsk.jdi.Field.type.type003
* nsk.jdi.Field.type.type003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Field.type.type003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type004.java
index 47336bb3b65..1ff16bcf17e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -65,7 +65,10 @@ public class type004 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type004/TestDescription.java
index 9820fa54721..0070ae5afbb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.Field.type.type004
* nsk.jdi.Field.type.type004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Field.type.type004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename001.java
index 32d6f6654f6..862704b855b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -166,7 +166,10 @@ public class typename001 {
private final static String debugeeName = debugerName + "a";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename001/TestDescription.java
index e3f76260421..30a3dbf701b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -44,7 +44,7 @@
* /test/lib
* @build nsk.jdi.Field.typeName.typename001
* nsk.jdi.Field.typeName.typename001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Field.typeName.typename001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename002.java
index 8f3d13b4241..d9c8c2bbbb6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -66,7 +66,10 @@ public class typename002 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename002/TestDescription.java
index 3e9d7b55e3c..0451ac10ce1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.Field.typeName.typename002
* nsk.jdi.Field.typeName.typename002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Field.typeName.typename002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001.java
index e9fad249353..156d4b471ba 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class floattype001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001/TestDescription.java
index 4c87888b9d0..56bf94be0ed 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.FloatType._itself_.floattype001
* nsk.jdi.FloatType._itself_.floattype001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.FloatType._itself_.floattype001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/compareTo/compareto001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/compareTo/compareto001.java
index 7294d37450d..1b3210966e8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/compareTo/compareto001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/compareTo/compareto001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -64,7 +64,10 @@ public class compareto001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/compareTo/compareto001/TestDescription.java
index c1b00a82a18..a92acfbdf61 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/compareTo/compareto001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/compareTo/compareto001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.FloatValue.compareTo.compareto001
* nsk.jdi.FloatValue.compareTo.compareto001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.FloatValue.compareTo.compareto001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals001.java
index 6ed5a5a7569..7cd878b5c01 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -78,7 +78,9 @@ public class equals001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals001/TestDescription.java
index 8b19150d86e..354c4f15a73 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.FloatValue.equals.equals001
* nsk.jdi.FloatValue.equals.equals001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.FloatValue.equals.equals001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals002.java
index 3ba11cb5626..51487d4a533 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -60,7 +60,10 @@ public class equals002 {
private static ReferenceType refType;
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals002/TestDescription.java
index 071e0758c7f..5ce2ff7c19e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.FloatValue.equals.equals002
* nsk.jdi.FloatValue.equals.equals002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.FloatValue.equals.equals002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/hashCode/hashcode001.java
index 846e7168174..f41b1175b39 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -76,7 +76,9 @@ public class hashcode001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/hashCode/hashcode001/TestDescription.java
index 86999ff7350..e67931375d0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.FloatValue.hashCode.hashcode001
* nsk.jdi.FloatValue.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.FloatValue.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/value/value001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/value/value001.java
index 82160389c63..e33d3d56806 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/value/value001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/value/value001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -95,7 +95,9 @@ public class value001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/value/value001/TestDescription.java
index dd213abfadb..9623526b4d2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/value/value001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/value/value001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.FloatValue.value.value001
* nsk.jdi.FloatValue.value.value001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.FloatValue.value.value001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/HiddenClass/events/events001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/HiddenClass/events/events001.java
index 39310f9af38..80742404738 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/HiddenClass/events/events001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/HiddenClass/events/events001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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,7 +33,7 @@
*
* @build nsk.jdi.HiddenClass.events.*
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.HiddenClass.events.events001
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -73,7 +73,10 @@ public class events001 extends DebuggerBase {
ArgumentHandler argHandler = new ArgumentHandler(args);
events001 debugger = new events001(argHandler);
- System.exit(debugger.run(argHandler) + JCK_STATUS_BASE);
+ int result = debugger.run(argHandler);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public int run(ArgumentHandler argHandler) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001.java
index 7d2e66b621e..cf0deb652d2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -67,7 +67,10 @@ import com.sun.jdi.connect.Connector.IntegerArgument;
public class intvalue001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001/TestDescription.java
index 24244b467fe..7f8601f9a38 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.IntegerArgument.intValue.intvalue001
- * @run main/othervm
+ * @run driver
* nsk.jdi.IntegerArgument.intValue.intvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002.java
index e78982a4463..b161df1676f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -69,7 +69,10 @@ import com.sun.jdi.connect.Connector.IntegerArgument;
public class intvalue002 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002/TestDescription.java
index bd0db60850a..5223b47694d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.IntegerArgument.intValue.intvalue002
- * @run main/othervm
+ * @run driver
* nsk.jdi.IntegerArgument.intValue.intvalue002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001.java
index dc108516356..3a3e5be0bcc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -64,7 +64,10 @@ import com.sun.jdi.connect.Connector.IntegerArgument;
public class isvalid001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001/TestDescription.java
index f750bb5697a..e0d8b54eff2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.IntegerArgument.isValid.isvalid001
- * @run main/othervm
+ * @run driver
* nsk.jdi.IntegerArgument.isValid.isvalid001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002.java
index 7c9669a1da8..63ba3db78e2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -65,7 +65,10 @@ import com.sun.jdi.connect.Connector.IntegerArgument;
public class isvalid002 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002/TestDescription.java
index 2fbfd0c15d6..bac47c562a1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -75,7 +75,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.IntegerArgument.isValid.isvalid002
- * @run main/othervm
+ * @run driver
* nsk.jdi.IntegerArgument.isValid.isvalid002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003.java
index 75600cdc3b9..27543955df7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -65,7 +65,10 @@ import com.sun.jdi.connect.Connector.IntegerArgument;
public class isvalid003 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003/TestDescription.java
index 0c7bd868a83..aa37da8aec0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.IntegerArgument.isValid.isvalid003
- * @run main/othervm
+ * @run driver
* nsk.jdi.IntegerArgument.isValid.isvalid003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001.java
index 27efbe9e777..2518bd9199f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -59,7 +59,10 @@ import com.sun.jdi.connect.Connector.IntegerArgument;
public class max001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001/TestDescription.java
index bdd8f4269ba..812da6b4fd3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.IntegerArgument.max.max001
- * @run main/othervm
+ * @run driver
* nsk.jdi.IntegerArgument.max.max001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001.java
index aff2f5a73bd..fd982e588f4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -58,7 +58,10 @@ import com.sun.jdi.connect.Connector.IntegerArgument;
public class min001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001/TestDescription.java
index 03724d50087..22f18d7cc93 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.IntegerArgument.min.min001
- * @run main/othervm
+ * @run driver
* nsk.jdi.IntegerArgument.min.min001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001.java
index 39a00aab3bb..5d6f22686dd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -61,7 +61,10 @@ import com.sun.jdi.connect.Connector.IntegerArgument;
public class setvalue001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
static int exitCode = 0;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001/TestDescription.java
index e026859ebda..cf87c3ecfd5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.IntegerArgument.setValue.setvalue001
- * @run main/othervm
+ * @run driver
* nsk.jdi.IntegerArgument.setValue.setvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001.java
index 34ba655155d..7c4961c8e95 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -65,7 +65,10 @@ import com.sun.jdi.connect.Connector.IntegerArgument;
public class stringvalueof001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001/TestDescription.java
index 9c3a3e6cac3..020218ed488 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.IntegerArgument.stringValueOf.stringvalueof001
- * @run main/othervm
+ * @run driver
* nsk.jdi.IntegerArgument.stringValueOf.stringvalueof001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001.java
index 218497f62da..206882b2768 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class integertype001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001/TestDescription.java
index a722cc58625..cf62701df0f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.IntegerType._itself_.integertype001
* nsk.jdi.IntegerType._itself_.integertype001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.IntegerType._itself_.integertype001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/compareTo/compareto001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/compareTo/compareto001.java
index ae2411b1853..2439062a2ea 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/compareTo/compareto001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/compareTo/compareto001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -64,7 +64,10 @@ public class compareto001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/compareTo/compareto001/TestDescription.java
index a601b6083c5..01280492a3c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/compareTo/compareto001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/compareTo/compareto001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.IntegerValue.compareTo.compareto001
* nsk.jdi.IntegerValue.compareTo.compareto001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.IntegerValue.compareTo.compareto001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals001.java
index 68dea3ff71e..dc25bd0b94f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -79,7 +79,9 @@ public class equals001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals001/TestDescription.java
index 6c6607b418a..57fad573544 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.IntegerValue.equals.equals001
* nsk.jdi.IntegerValue.equals.equals001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.IntegerValue.equals.equals001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals002.java
index 24e2a42b1d5..c4a15af1bfc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -60,7 +60,10 @@ public class equals002 {
private static ReferenceType refType;
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals002/TestDescription.java
index dcefc51634d..b6bdf82945f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.IntegerValue.equals.equals002
* nsk.jdi.IntegerValue.equals.equals002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.IntegerValue.equals.equals002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/hashCode/hashcode001.java
index 5d730e3baf5..fcb721265b0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -74,7 +74,9 @@ public class hashcode001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/hashCode/hashcode001/TestDescription.java
index 0f143f424f8..c68b5a7c401 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.IntegerValue.hashCode.hashcode001
* nsk.jdi.IntegerValue.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.IntegerValue.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/value/value001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/value/value001.java
index 84816e2af10..a29efb1ea0a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/value/value001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/value/value001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -77,7 +77,9 @@ public class value001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/value/value001/TestDescription.java
index 4edf62e75d4..4797e192e69 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/value/value001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/value/value001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.IntegerValue.value.value001
* nsk.jdi.IntegerValue.value.value001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.IntegerValue.value.value001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/implementors/implementors001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/implementors/implementors001.java
index 48b68dcaebb..1f9d6c18a45 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/implementors/implementors001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/implementors/implementors001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -64,7 +64,9 @@ public class implementors001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/implementors/implementors001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/implementors/implementors001/TestDescription.java
index 4985d65f4dc..4410b2f3530 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/implementors/implementors001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/implementors/implementors001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.InterfaceType.implementors.implementors001
* nsk.jdi.InterfaceType.implementors.implementors001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.InterfaceType.implementors.implementors001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/subinterfaces/subinterfaces001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/subinterfaces/subinterfaces001.java
index cffdfa5e770..faf40f3864e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/subinterfaces/subinterfaces001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/subinterfaces/subinterfaces001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -64,7 +64,9 @@ public class subinterfaces001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/subinterfaces/subinterfaces001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/subinterfaces/subinterfaces001/TestDescription.java
index c8bb62944e1..91b89654b98 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/subinterfaces/subinterfaces001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/subinterfaces/subinterfaces001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.InterfaceType.subinterfaces.subinterfaces001
* nsk.jdi.InterfaceType.subinterfaces.subinterfaces001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.InterfaceType.subinterfaces.subinterfaces001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/superinterfaces/superinterfaces001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/superinterfaces/superinterfaces001.java
index 7dd567db76d..dd90d7bf149 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/superinterfaces/superinterfaces001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/superinterfaces/superinterfaces001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,9 @@ public class superinterfaces001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/superinterfaces/superinterfaces001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/superinterfaces/superinterfaces001/TestDescription.java
index 50d71bcf0e2..3ec45723709 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/superinterfaces/superinterfaces001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/superinterfaces/superinterfaces001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.InterfaceType.superinterfaces.superinterfaces001
* nsk.jdi.InterfaceType.superinterfaces.superinterfaces001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.InterfaceType.superinterfaces.superinterfaces001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch001.java
index bafa534bec1..20d5063d93f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -56,9 +56,11 @@ public class launch001 {
private final static String DEBUGEE_CLASS =
"nsk.jdi.LaunchingConnector.launch.launch001o";
- public static void main (String args[]) {
- System.exit(run(args,System.out) + JCK_STATUS_BASE);
- // JCK-style exit status.
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String args[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch002.java
index e2eb8168f2a..580b80bf7a0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -56,9 +56,11 @@ public class launch002 {
private final static String DEBUGEE_CLASS =
"nsk.jdi.LaunchingConnector.launch.launch002o";
- public static void main (String args[]) {
- System.exit(run(args,System.out) + JCK_STATUS_BASE);
- // JCK-style exit status.
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String args[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java
index 2cc3fa73806..9e2c156aa0c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -56,9 +56,11 @@ public class launch003 {
private final static String DEBUGEE_CLASS =
"nsk.jdi.LaunchingConnector.launch.launch003o";
- public static void main(String args[]) {
- System.exit(run(args,System.out) + JCK_STATUS_BASE);
- // JCK-style exit status.
+ public static void main(String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String args[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java
index f4b57109c10..7c6f45d744e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -56,9 +56,11 @@ public class launch004 {
private final static String DEBUGEE_CLASS =
"nsk.jdi.LaunchingConnector.launch.launch004o";
- public static void main(String args[]) {
- System.exit(run(args,System.out) + JCK_STATUS_BASE);
- // JCK-style exit status.
+ public static void main(String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String args[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launchnosuspend/launchnosuspend001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launchnosuspend/launchnosuspend001.java
index 9c03396d67f..015643f3a18 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launchnosuspend/launchnosuspend001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launchnosuspend/launchnosuspend001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -57,9 +57,11 @@ public class launchnosuspend001 {
private final static String DEBUGEE_CLASS =
"nsk.jdi.LaunchingConnector.launchnosuspend.launchnosuspend001o";
- public static void main (String args[]) {
- System.exit(run(args,System.out) + JCK_STATUS_BASE);
- // JCK-style exit status.
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String args[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java
index 3d700abbf62..11aada10a61 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -58,7 +58,10 @@ public class accept001 {
IORedirector errRedirector;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java
index a3bbf3f8c94..2f5a966098a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -59,7 +59,10 @@ public class accept002 {
IORedirector errRedirector;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java
index fc381e86c1d..2c63d6dc0fa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -58,7 +58,10 @@ public class listennosuspend001 {
IORedirector errRedirector;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java
index 43e3b9fa700..381fdced516 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -78,7 +78,10 @@ public class startlis001 {
boolean totalRes = true;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java
index 262d628e20b..ddae7cb364f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -72,7 +72,10 @@ public class startlis002 {
boolean totalRes = true;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001.java
index 340c70a2ad1..9fa40e17d5a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -65,7 +65,10 @@ public class stoplis001 {
boolean totalRes = true;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java
index 77da13e38f5..c3298a3111f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -46,7 +46,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.ListeningConnector.stopListening.stoplis001
- * @run main/othervm
+ * @run driver
* nsk.jdi.ListeningConnector.stopListening.stoplis001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002.java
index 68aa0ba92dc..e6f74d02ec0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -65,7 +65,10 @@ public class stoplis002 {
boolean totalRes = true;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002/TestDescription.java
index a41779deeaf..253dcfe5636 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -46,7 +46,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.ListeningConnector.stopListening.stoplis002
- * @run main/othervm
+ * @run driver
* nsk.jdi.ListeningConnector.stopListening.stoplis002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001.java
index 2f668865620..1232c8e7f8a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -57,7 +57,10 @@ import com.sun.jdi.connect.ListeningConnector;
public class supportsmultipleconnections001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001/TestDescription.java
index 93f7ee106a4..1f913ecee3e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -42,7 +42,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.ListeningConnector.supportsMultipleConnections.supportsmultipleconnections001
- * @run main/othervm
+ * @run driver
* nsk.jdi.ListeningConnector.supportsMultipleConnections.supportsmultipleconnections001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/equals/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/equals/equals001.java
index 7ab3d6d3b17..3091f6adc2d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/equals/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/equals/equals001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,7 +75,9 @@ public class equals001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/equals/equals001/TestDescription.java
index 60c4bd329e6..092dd733d8c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/equals/equals001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/equals/equals001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -75,7 +75,7 @@
* @clean nsk.jdi.LocalVariable.equals.equals001a
* @compile -g:lines,source,vars ../equals001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.LocalVariable.equals.equals001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/genericSignature/gensignature001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/genericSignature/gensignature001.java
index b2427fdbc95..125e0740761 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/genericSignature/gensignature001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/genericSignature/gensignature001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, 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
@@ -103,8 +103,10 @@ public class gensignature001 {
static Log log;
public static void main (String argv[]) {
- int result = run(argv, System.out);
- System.exit(result + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/genericSignature/gensignature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/genericSignature/gensignature001/TestDescription.java
index 060f69baacb..015f8a227e5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/genericSignature/gensignature001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/genericSignature/gensignature001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @clean nsk.jdi.LocalVariable.genericSignature.gensignature001a
* @compile -g:lines,source,vars ../gensignature001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.LocalVariable.genericSignature.gensignature001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/hashCode/hashcode001.java
index af651f7010a..2a633ee1cf5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -74,7 +74,9 @@ public class hashcode001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/hashCode/hashcode001/TestDescription.java
index 14ae71e10f0..36b8e2b3050 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* @clean nsk.jdi.LocalVariable.hashCode.hashcode001a
* @compile -g:lines,source,vars ../hashcode001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.LocalVariable.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isArgument/isargument001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isArgument/isargument001.java
index bd7b68fe7de..b145938484d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isArgument/isargument001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isArgument/isargument001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class isargument001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isArgument/isargument001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isArgument/isargument001/TestDescription.java
index 506201f435a..e4cd9b9b7e4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isArgument/isargument001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isArgument/isargument001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* @clean nsk.jdi.LocalVariable.isArgument.isargument001a
* @compile -g:lines,source,vars ../isargument001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.LocalVariable.isArgument.isargument001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001.java
index 5593aabe31b..acaca06f4ea 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -81,7 +81,9 @@ public class isvisible001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001/TestDescription.java
index 897383dd9fe..58c0dbe9b42 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -79,7 +79,7 @@
* @clean nsk.jdi.LocalVariable.isVisible.isvisible001a
* @compile -g:lines,source,vars ../isvisible001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.LocalVariable.isVisible.isvisible001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/name/name001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/name/name001.java
index 9847033eca2..c1b26513f9a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/name/name001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/name/name001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -81,7 +81,9 @@ public class name001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/name/name001/TestDescription.java
index b8c15a9b5dc..f01bc8f7cb2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/name/name001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/name/name001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* @clean nsk.jdi.LocalVariable.name.name001a
* @compile -g:lines,source,vars ../name001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.LocalVariable.name.name001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/signature/signature001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/signature/signature001.java
index 15c8f16318a..832d9b023aa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/signature/signature001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/signature/signature001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -81,7 +81,9 @@ public class signature001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/signature/signature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/signature/signature001/TestDescription.java
index d6f98e6bcea..d08b26b5aa9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/signature/signature001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/signature/signature001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* @clean nsk.jdi.LocalVariable.signature.signature001a
* @compile -g:lines,source,vars ../signature001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.LocalVariable.signature.signature001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/toString/tostring001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/toString/tostring001.java
index 869768a3134..717eaf543bb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/toString/tostring001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/toString/tostring001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -88,7 +88,10 @@ public class tostring001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/toString/tostring001/TestDescription.java
index 7c62bf2520c..14a1797e549 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/toString/tostring001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/toString/tostring001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -49,7 +49,7 @@
* @clean nsk.jdi.LocalVariable.toString.tostring001a
* @compile -g:lines,source,vars ../tostring001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.LocalVariable.toString.tostring001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type001.java
index 5f215bcbf21..73ba9576e3b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class type001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type001/TestDescription.java
index d823c5b2d2b..0e0dfd492c8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -79,7 +79,7 @@
* @clean nsk.jdi.LocalVariable.type.type001a
* @compile -g:lines,source,vars ../type001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.LocalVariable.type.type001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type002.java
index 3019a3eefcb..7754a243f1f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,7 +75,9 @@ public class type002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type002/TestDescription.java
index ce480388a56..494ef29a3b5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -79,7 +79,7 @@
* @clean nsk.jdi.LocalVariable.type.type002a
* @compile -g:lines,source,vars ../type002a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.LocalVariable.type.type002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename001.java
index e60665cbb57..b814b36362e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class typename001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename001/TestDescription.java
index 8720070aefb..8535af49450 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* @clean nsk.jdi.LocalVariable.typeName.typename001a
* @compile -g:lines,source,vars ../typename001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.LocalVariable.typeName.typename001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename002.java
index d5730ebd86e..a08f8924a75 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,7 +75,9 @@ public class typename002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename002/TestDescription.java
index 3de0f7f2d2f..d1874f83ed3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* @clean nsk.jdi.LocalVariable.typeName.typename002a
* @compile -g:lines,source,vars ../typename002a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.LocalVariable.typeName.typename002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location001.java
index 5ccf4daf10a..716030f5c94 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -78,7 +78,9 @@ public class location001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location001/TestDescription.java
index f0ef1691215..bf7939759b6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.Locatable.location.location001
* nsk.jdi.Locatable.location.location001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Locatable.location.location001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location002.java
index 5b39cc9b6a3..711da9e56f8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -68,7 +68,9 @@ public class location002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location002/TestDescription.java
index dcf9cb62b27..1404e22fc4e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.Locatable.location.location002
* nsk.jdi.Locatable.location.location002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Locatable.location.location002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location003.java
index bba0ccf115e..7a6b2a4d7d4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class location003 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location003/TestDescription.java
index 936d6894c49..9632d12dc4b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.Locatable.location.location003
* nsk.jdi.Locatable.location.location003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Locatable.location.location003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004.java
index cd13257cde0..a1110961b70 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -70,7 +70,9 @@ public class location004 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004/TestDescription.java
index a530556985d..c628e4c5500 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.Locatable.location.location004
* nsk.jdi.Locatable.location.location004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Locatable.location.location004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005.java
index c41331ea2ec..486697cc1e4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -70,7 +70,9 @@ public class location005 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005/TestDescription.java
index 92b530aeca0..bc931af5b5e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.Locatable.location.location005
* nsk.jdi.Locatable.location.location005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Locatable.location.location005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location006.java
index c4e5b78f45e..16ac744695e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,7 +69,9 @@ public class location006 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location006/TestDescription.java
index 78b7c52925f..0931771b0ad 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.Locatable.location.location006
* nsk.jdi.Locatable.location.location006a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Locatable.location.location006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001.java
index 1225b24893c..543123066cf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -91,7 +91,9 @@ public class thread001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001/TestDescription.java
index 76ed5e2f3ec..ff8bed293ad 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.LocatableEvent.thread.thread001
* nsk.jdi.LocatableEvent.thread.thread001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.LocatableEvent.thread.thread001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/codeIndex/codeindex001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/codeIndex/codeindex001.java
index f71934c0468..17ee800f64b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/codeIndex/codeindex001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/codeIndex/codeindex001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -62,7 +62,9 @@ public class codeindex001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/codeIndex/codeindex001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/codeIndex/codeindex001/TestDescription.java
index ff2f70ac547..2171ceedc41 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/codeIndex/codeindex001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/codeIndex/codeindex001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* @clean nsk.jdi.Location.codeIndex.codeindex001a
* @compile -g:lines,source,vars ../codeindex001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Location.codeIndex.codeindex001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/declaringType/declaringtype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/declaringType/declaringtype001.java
index 484644e9773..1946786298f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/declaringType/declaringtype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/declaringType/declaringtype001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -68,7 +68,9 @@ public class declaringtype001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/declaringType/declaringtype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/declaringType/declaringtype001/TestDescription.java
index 4095c80efea..7a7da05bf2f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/declaringType/declaringtype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/declaringType/declaringtype001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* @clean nsk.jdi.Location.declaringType.declaringtype001a
* @compile -g:lines,source,vars ../declaringtype001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Location.declaringType.declaringtype001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/equals/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/equals/equals001.java
index 7c91c74a667..8d65c31d3f5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/equals/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/equals/equals001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,9 @@ public class equals001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/equals/equals001/TestDescription.java
index 2527df767f4..3f6fb9ff67e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/equals/equals001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/equals/equals001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* @clean nsk.jdi.Location.equals.equals001a
* @compile -g:lines,source,vars ../equals001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Location.equals.equals001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/hashCode/hashcode001.java
index 6ce0d7d1444..b0eb8e53ba7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,9 @@ public class hashcode001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/hashCode/hashcode001/TestDescription.java
index 12ac8c31988..87a5660431d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* @clean nsk.jdi.Location.hashCode.hashcode001a
* @compile -g:lines,source,vars ../hashcode001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Location.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber/linenumber001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber/linenumber001.java
index c3effdf6ca5..a4b9f2b8012 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber/linenumber001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber/linenumber001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -60,7 +60,9 @@ public class linenumber001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber/linenumber001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber/linenumber001/TestDescription.java
index 8fd4f94d41a..313138ce82f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber/linenumber001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber/linenumber001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -82,7 +82,7 @@
* @clean nsk.jdi.Location.lineNumber.linenumber001a
* @compile -g:lines,source,vars ../linenumber001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Location.lineNumber.linenumber001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/lineNumber_s002/lineNumber_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/lineNumber_s002/lineNumber_s002.java
index 5f58c23caa6..267eec62e87 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/lineNumber_s002/lineNumber_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/lineNumber_s002/lineNumber_s002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -51,7 +51,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Location.lineNumber_s.lineNumber_s002.lineNumber_s002
- * @run main/othervm
+ * @run driver
* nsk.jdi.Location.lineNumber_s.lineNumber_s002.lineNumber_s002
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -73,7 +73,10 @@ import nsk.share.jdi.sde.*;
public class lineNumber_s002 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/linenumber_s001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/linenumber_s001.java
index eca38d521b9..33a2939a2d9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/linenumber_s001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/linenumber_s001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -62,7 +62,9 @@ public class linenumber_s001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/linenumber_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/linenumber_s001/TestDescription.java
index 60abf0f0ce2..cdd73f9ce8e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/linenumber_s001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/linenumber_s001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* @clean nsk.jdi.Location.lineNumber_s.linenumber_s001a
* @compile -g:lines,source,vars ../linenumber_s001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Location.lineNumber_s.linenumber_s001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/method/method001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/method/method001.java
index 35d9eb11774..17cd9500ccc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/method/method001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/method/method001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -61,7 +61,9 @@ public class method001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/method/method001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/method/method001/TestDescription.java
index 984619e38a2..6969eb32cfb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/method/method001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/method/method001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.Location.method.method001
* nsk.jdi.Location.method.method001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Location.method.method001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName/sourcename001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName/sourcename001.java
index 8b8f08e3d56..1eb9640b110 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName/sourcename001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName/sourcename001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class sourcename001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName/sourcename001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName/sourcename001/TestDescription.java
index cc5e78fb773..54f8fbef37b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName/sourcename001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName/sourcename001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -76,7 +76,7 @@
* @clean nsk.jdi.Location.sourceName.sourcename001a
* @compile -g:lines,source,vars ../sourcename001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Location.sourceName.sourcename001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourceName_s002/sourceName_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourceName_s002/sourceName_s002.java
index d288cf62ae0..a64d2dc6e8b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourceName_s002/sourceName_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourceName_s002/sourceName_s002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -52,7 +52,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Location.sourceName_s.sourceName_s002.sourceName_s002
- * @run main/othervm
+ * @run driver
* nsk.jdi.Location.sourceName_s.sourceName_s002.sourceName_s002
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -74,7 +74,10 @@ import nsk.share.jdi.sde.*;
public class sourceName_s002 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourcename_s001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourcename_s001.java
index 2770989b0f2..8cff4da8a00 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourcename_s001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourcename_s001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -68,7 +68,9 @@ public class sourcename_s001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourcename_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourcename_s001/TestDescription.java
index 33766e953b5..d33eeb8f0f6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourcename_s001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourcename_s001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@
* @clean nsk.jdi.Location.sourceName_s.sourcename_s001a
* @compile -g:lines,source,vars ../sourcename_s001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Location.sourceName_s.sourcename_s001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath/sourcepath001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath/sourcepath001.java
index a50fa645ca7..7b5bdcf156c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath/sourcepath001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath/sourcepath001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class sourcepath001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath/sourcepath001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath/sourcepath001/TestDescription.java
index 3d56d4a6f90..02cdcb1eb75 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath/sourcepath001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath/sourcepath001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* @clean nsk.jdi.Location.sourcePath.sourcepath001a
* @compile -g:lines,source,vars ../sourcepath001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Location.sourcePath.sourcepath001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcePath_s002/sourcePath_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcePath_s002/sourcePath_s002.java
index 20268e6954b..5a47013302b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcePath_s002/sourcePath_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcePath_s002/sourcePath_s002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -52,7 +52,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Location.sourcePath_s.sourcePath_s002.sourcePath_s002
- * @run main/othervm
+ * @run driver
* nsk.jdi.Location.sourcePath_s.sourcePath_s002.sourcePath_s002
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -74,7 +74,10 @@ import nsk.share.jdi.sde.*;
public class sourcePath_s002 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcepath_s001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcepath_s001.java
index b2201c2bd53..598f9c47d64 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcepath_s001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcepath_s001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class sourcepath_s001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcepath_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcepath_s001/TestDescription.java
index c696bd69b54..cedc0ef794d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcepath_s001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcepath_s001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -83,7 +83,7 @@
* @clean nsk.jdi.Location.sourcePath_s.sourcepath_s001a
* @compile -g:lines,source,vars ../sourcepath_s001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Location.sourcePath_s.sourcepath_s001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001.java
index 27b59475661..05d5baf3a66 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class longtype001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001/TestDescription.java
index 819b918a954..769ba84492e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.LongType._itself_.longtype001
* nsk.jdi.LongType._itself_.longtype001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.LongType._itself_.longtype001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/compareTo/compareto001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/compareTo/compareto001.java
index 2a1e00012b2..c009afd3378 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/compareTo/compareto001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/compareTo/compareto001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -64,7 +64,10 @@ public class compareto001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/compareTo/compareto001/TestDescription.java
index 7cc3e49aee9..8b3ac63f6ab 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/compareTo/compareto001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/compareTo/compareto001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.LongValue.compareTo.compareto001
* nsk.jdi.LongValue.compareTo.compareto001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.LongValue.compareTo.compareto001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals001.java
index 897b15e3487..d76a6ba4b24 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -79,7 +79,9 @@ public class equals001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals001/TestDescription.java
index d3e67eb71f6..6001761bc2b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.LongValue.equals.equals001
* nsk.jdi.LongValue.equals.equals001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.LongValue.equals.equals001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals002.java
index e37faac6cb4..6693466c5d9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -60,7 +60,10 @@ public class equals002 {
private static ReferenceType refType;
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals002/TestDescription.java
index 2935702b096..7f286b86638 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.LongValue.equals.equals002
* nsk.jdi.LongValue.equals.equals002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.LongValue.equals.equals002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/hashCode/hashcode001.java
index 7719789504f..b3992b25b9d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -74,7 +74,9 @@ public class hashcode001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/hashCode/hashcode001/TestDescription.java
index 7b204a3f1ac..5747c4e88cf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.LongValue.hashCode.hashcode001
* nsk.jdi.LongValue.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.LongValue.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/value/value001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/value/value001.java
index 344782e230b..47c4f1ae99b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/value/value001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/value/value001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -77,7 +77,9 @@ public class value001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/value/value001/TestDescription.java
index 6354b2449bd..d4d9226de1b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/value/value001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/value/value001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.LongValue.value.value001
* nsk.jdi.LongValue.value.value001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.LongValue.value.value001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/_bounds_/bounds001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/_bounds_/bounds001.java
index a0484d08ef0..252c93974e8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/_bounds_/bounds001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/_bounds_/bounds001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -109,7 +109,10 @@ public class bounds001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/_bounds_/bounds001/TestDescription.java
index 565e171c50e..f96a6e21ac4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/_bounds_/bounds001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/_bounds_/bounds001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* @clean nsk.jdi.Method._bounds_.bounds001a
* @compile -g:lines,source,vars ../bounds001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method._bounds_.bounds001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations001.java
index f20181e8381..e0c8254905c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -58,7 +58,9 @@ public class alllinelocations001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations001/TestDescription.java
index b680ae38615..75b5ac32357 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -89,7 +89,7 @@
* @clean nsk.jdi.Method.allLineLocations.alllinelocations001a
* @compile -g:lines,source,vars ../alllinelocations001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.allLineLocations.alllinelocations001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations002.java
index 982b25b12ef..c52dda7bd67 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -60,7 +60,9 @@ public class alllinelocations002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations002/TestDescription.java
index 420138019e5..8d76d2a2792 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -89,7 +89,7 @@
* @clean nsk.jdi.Method.allLineLocations.alllinelocations002a
* @compile -g:lines,source,vars ../alllinelocations002a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.allLineLocations.alllinelocations002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss002/allLineLocations_ss002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss002/allLineLocations_ss002.java
index e9f52f1e88d..67576ce6f2c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss002/allLineLocations_ss002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss002/allLineLocations_ss002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -56,7 +56,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Method.allLineLocations_ss.allLineLocations_ss002.allLineLocations_ss002
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.allLineLocations_ss.allLineLocations_ss002.allLineLocations_ss002
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -79,7 +79,10 @@ import nsk.share.jdi.sde.*;
public class allLineLocations_ss002 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java
index f052d2b91fd..1a72877067e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -57,7 +57,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Method.allLineLocations_ss.allLineLocations_ss003.allLineLocations_ss003
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.allLineLocations_ss.allLineLocations_ss003.allLineLocations_ss003
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -80,7 +80,10 @@ import nsk.share.jdi.sde.*;
public class allLineLocations_ss003 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/alllinelocations_ss001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/alllinelocations_ss001.java
index 0970bdfab26..e4376562f67 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/alllinelocations_ss001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/alllinelocations_ss001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -65,7 +65,9 @@ public class alllinelocations_ss001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/alllinelocations_ss001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/alllinelocations_ss001/TestDescription.java
index d978792985d..36d5517147a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/alllinelocations_ss001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/alllinelocations_ss001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -91,7 +91,7 @@
* @clean nsk.jdi.Method.allLineLocations_ss.alllinelocations_ss001a
* @compile -g:lines,source,vars ../alllinelocations_ss001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.allLineLocations_ss.alllinelocations_ss001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames001.java
index afad31266ff..88555336b0d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class argumenttypenames001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames001/TestDescription.java
index 09bafd677d8..e3452da5c4b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.Method.argumentTypeNames.argumenttypenames001
* nsk.jdi.Method.argumentTypeNames.argumenttypenames001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.argumentTypeNames.argumenttypenames001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames002.java
index b9236dd6ebc..13f37eefa43 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -80,7 +80,9 @@ public class argumenttypenames002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames002/TestDescription.java
index 328633387a5..c5280fc2967 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.Method.argumentTypeNames.argumenttypenames002
* nsk.jdi.Method.argumentTypeNames.argumenttypenames002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.argumentTypeNames.argumenttypenames002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames003.java
index 94b52a7cb59..b52f900d65c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -61,7 +61,10 @@ public class argumenttypenames003 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames003/TestDescription.java
index 9c45d78a8c8..ea567f3f1c1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @clean nsk.jdi.Method.argumentTypeNames.argumenttypenames003a
* @compile -g:lines,source,vars ../argumenttypenames003a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.argumentTypeNames.argumenttypenames003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes001.java
index e9882b87efa..d8ea0f77ae4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class argumenttypes001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes001/TestDescription.java
index 7f141d064b0..28dcc81770a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.Method.argumentTypes.argumenttypes001
* nsk.jdi.Method.argumentTypes.argumenttypes001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.argumentTypes.argumenttypes001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes002.java
index f404645883c..a9fbb6cd5a7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class argumenttypes002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes002/TestDescription.java
index 77ba8465b50..95fc80da423 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.Method.argumentTypes.argumenttypes002
* nsk.jdi.Method.argumentTypes.argumenttypes002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.argumentTypes.argumenttypes002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments001.java
index 4ac070443a4..b5dfc041636 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -64,7 +64,9 @@ public class arguments001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments001/TestDescription.java
index 84d988332e3..5302d341d28 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -85,7 +85,7 @@
* @clean nsk.jdi.Method.arguments.arguments001a
* @compile -g:lines,source,vars ../arguments001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.arguments.arguments001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments002.java
index 37a02252fa6..8adeec279b7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -60,7 +60,9 @@ public class arguments002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments002/TestDescription.java
index 71d208e8974..d595f169545 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.Method.arguments.arguments002
* nsk.jdi.Method.arguments.arguments002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.arguments.arguments002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments003.java
index 4355739cb31..d748cb25490 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -61,7 +61,10 @@ public class arguments003 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments003/TestDescription.java
index 386cede022b..562ae8e802d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @clean nsk.jdi.Method.arguments.arguments003a
* @compile -g:lines,source,vars ../arguments003a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.arguments.arguments003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/bytecodes/bytecodes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/bytecodes/bytecodes001.java
index 84b0bf465e5..a413d276c52 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/bytecodes/bytecodes001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/bytecodes/bytecodes001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -61,7 +61,9 @@ public class bytecodes001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/bytecodes/bytecodes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/bytecodes/bytecodes001/TestDescription.java
index d8c486f423a..e7ae5f156a6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/bytecodes/bytecodes001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/bytecodes/bytecodes001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.Method.bytecodes.bytecodes001
* nsk.jdi.Method.bytecodes.bytecodes001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.bytecodes.bytecodes001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/equals/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/equals/equals001.java
index 33a842228c0..8eefb7d126a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/equals/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/equals/equals001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -62,7 +62,9 @@ public class equals001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/equals/equals001/TestDescription.java
index b3cdf315042..d0a5c9a018a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/equals/equals001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/equals/equals001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.Method.equals.equals001
* nsk.jdi.Method.equals.equals001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.equals.equals001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/hashCode/hashcode001.java
index c3cdd26dc15..44cd40ce652 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -62,7 +62,9 @@ public class hashcode001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/hashCode/hashcode001/TestDescription.java
index d83a0e07083..025e0dd3be0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.Method.hashCode.hashcode001
* nsk.jdi.Method.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isAbstract/isabstract001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isAbstract/isabstract001.java
index b52bba25f35..25d95cb44e0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isAbstract/isabstract001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isAbstract/isabstract001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -64,7 +64,9 @@ public class isabstract001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isAbstract/isabstract001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isAbstract/isabstract001/TestDescription.java
index fb8d671c08d..e0c517417d7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isAbstract/isabstract001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isAbstract/isabstract001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.Method.isAbstract.isabstract001
* nsk.jdi.Method.isAbstract.isabstract001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.isAbstract.isabstract001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isBridge/isbridge001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isBridge/isbridge001.java
index fba24de3a4c..cbc3162c07b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isBridge/isbridge001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isBridge/isbridge001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -150,7 +150,10 @@ public class isbridge001 {
private int tot_res = Consts.TEST_PASSED;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isBridge/isbridge001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isBridge/isbridge001/TestDescription.java
index 6e2d274974e..f999fac4948 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isBridge/isbridge001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isBridge/isbridge001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.Method.isBridge.isbridge001
* nsk.jdi.Method.isBridge.isbridge001t
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.isBridge.isbridge001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isConstructor/isconstructor001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isConstructor/isconstructor001.java
index 002947a1c4a..d9f183c023b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isConstructor/isconstructor001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isConstructor/isconstructor001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -59,7 +59,9 @@ public class isconstructor001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isConstructor/isconstructor001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isConstructor/isconstructor001/TestDescription.java
index ae5f8ec47a0..3532a3b4223 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isConstructor/isconstructor001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isConstructor/isconstructor001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.Method.isConstructor.isconstructor001
* nsk.jdi.Method.isConstructor.isconstructor001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.isConstructor.isconstructor001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isNative/isnative001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isNative/isnative001.java
index 3419e002762..7678fe6dfb5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isNative/isnative001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isNative/isnative001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -59,7 +59,9 @@ public class isnative001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isNative/isnative001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isNative/isnative001/TestDescription.java
index a00d27c0605..a8cd14d0bb4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isNative/isnative001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isNative/isnative001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.Method.isNative.isnative001
* nsk.jdi.Method.isNative.isnative001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.isNative.isnative001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001.java
index c45c87e0b1a..02ce3f5e020 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,9 @@ public class isobsolete001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001/TestDescription.java
index df86aa3f723..7ba25ad3fec 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -80,7 +80,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.isObsolete.isobsolete001
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002.java
index 464b43c3ff5..1693a63843e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class isobsolete002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002/TestDescription.java
index 11433217aba..9099665b2fa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -81,7 +81,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.isObsolete.isobsolete002
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003.java
index c6328ad8a3d..0f6339b0ae4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -57,7 +57,10 @@ public class isobsolete003 {
private static EventIterator eventIterator;
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003/TestDescription.java
index c102570f241..58ef3046f18 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -94,7 +94,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.isObsolete.isobsolete003
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isStaticInitializer/isstinitializer001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isStaticInitializer/isstinitializer001.java
index 5b062b0f217..4ce71e8a269 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isStaticInitializer/isstinitializer001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isStaticInitializer/isstinitializer001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -59,7 +59,9 @@ public class isstinitializer001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isStaticInitializer/isstinitializer001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isStaticInitializer/isstinitializer001/TestDescription.java
index 966b225ee27..5d6a4cbe135 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isStaticInitializer/isstinitializer001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isStaticInitializer/isstinitializer001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.Method.isStaticInitializer.isstinitializer001
* nsk.jdi.Method.isStaticInitializer.isstinitializer001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.isStaticInitializer.isstinitializer001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isSynchronized/issynchronized001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isSynchronized/issynchronized001.java
index 1149558e38b..2791245b945 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isSynchronized/issynchronized001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isSynchronized/issynchronized001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -59,7 +59,9 @@ public class issynchronized001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isSynchronized/issynchronized001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isSynchronized/issynchronized001/TestDescription.java
index a56e587c6e6..9c53ecb4752 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isSynchronized/issynchronized001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isSynchronized/issynchronized001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.Method.isSynchronized.issynchronized001
* nsk.jdi.Method.isSynchronized.issynchronized001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.isSynchronized.issynchronized001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isVarArgs/isvarargs001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isVarArgs/isvarargs001.java
index c8f788d344d..dc594528417 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isVarArgs/isvarargs001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isVarArgs/isvarargs001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -61,7 +61,10 @@ public class isvarargs001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isVarArgs/isvarargs001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isVarArgs/isvarargs001/TestDescription.java
index 12624f10d3f..aa9c3dd9942 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isVarArgs/isvarargs001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isVarArgs/isvarargs001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.Method.isVarArgs.isvarargs001
* nsk.jdi.Method.isVarArgs.isvarargs001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.isVarArgs.isvarargs001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationOfCodeIndex/locationofcodeindex001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationOfCodeIndex/locationofcodeindex001.java
index 932c9db718b..9e8d2cdc25a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationOfCodeIndex/locationofcodeindex001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationOfCodeIndex/locationofcodeindex001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,9 @@ public class locationofcodeindex001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationOfCodeIndex/locationofcodeindex001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationOfCodeIndex/locationofcodeindex001/TestDescription.java
index c91e46160f6..bcec655884d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationOfCodeIndex/locationofcodeindex001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationOfCodeIndex/locationofcodeindex001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* @clean nsk.jdi.Method.locationOfCodeIndex.locationofcodeindex001a
* @compile -g:lines,source,vars ../locationofcodeindex001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.locationOfCodeIndex.locationofcodeindex001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine/locationsofline001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine/locationsofline001.java
index a186fe08397..3b536a2d507 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine/locationsofline001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine/locationsofline001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -65,7 +65,9 @@ public class locationsofline001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine/locationsofline001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine/locationsofline001/TestDescription.java
index 15032ff8681..29c59da1be3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine/locationsofline001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine/locationsofline001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -88,7 +88,7 @@
* @clean nsk.jdi.Method.locationsOfLine.locationsofline001a
* @compile -g:lines,source,vars ../locationsofline001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.locationsOfLine.locationsofline001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi002/locationsOfLine_ssi002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi002/locationsOfLine_ssi002.java
index 10d0ad754e6..6265be91fc1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi002/locationsOfLine_ssi002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi002/locationsOfLine_ssi002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -57,7 +57,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Method.locationsOfLine_ssi.locationsOfLine_ssi002.locationsOfLine_ssi002
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.locationsOfLine_ssi.locationsOfLine_ssi002.locationsOfLine_ssi002
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -80,7 +80,10 @@ import nsk.share.jdi.sde.*;
public class locationsOfLine_ssi002 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java
index 7c896c8bfd8..405d775ea87 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -57,7 +57,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Method.locationsOfLine_ssi.locationsOfLine_ssi003.locationsOfLine_ssi003
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.locationsOfLine_ssi.locationsOfLine_ssi003.locationsOfLine_ssi003
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -80,7 +80,10 @@ import nsk.share.jdi.sde.*;
public class locationsOfLine_ssi003 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsofline_ssi001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsofline_ssi001.java
index 23f8e7fb7ed..167e57f7701 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsofline_ssi001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsofline_ssi001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -68,7 +68,9 @@ public class locationsofline_ssi001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java
index d87b7d75f9d..a92732465d4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -86,7 +86,7 @@
* @clean nsk.jdi.Method.locationsOfLine_ssi.locationsofline_ssi001a
* @compile -g:lines,source,vars ../locationsofline_ssi001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.locationsOfLine_ssi.locationsofline_ssi001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype001.java
index 2d41fae1a41..b682f2fa118 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,7 +76,9 @@ public class returntype001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype001/TestDescription.java
index 24689cb7cd8..644259a834a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.Method.returnType.returntype001
* nsk.jdi.Method.returnType.returntype001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.returnType.returntype001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype002.java
index 93ff39df6fa..6381e89efcc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,7 +69,9 @@ public class returntype002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype002/TestDescription.java
index 2dbf12bc1d7..03b07a46a05 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.Method.returnType.returntype002
* nsk.jdi.Method.returnType.returntype002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.returnType.returntype002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype003.java
index 5276d06f0a6..e0d49bab73c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class returntype003 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype003/TestDescription.java
index f1b1088c68c..ea9d744377a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.Method.returnType.returntype003
* nsk.jdi.Method.returnType.returntype003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.returnType.returntype003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames001.java
index daa9b69cfca..3a2351568b6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,7 +77,9 @@ public class returntypenames001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames001/TestDescription.java
index c3743051e9e..7c98337c4c5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.Method.returnTypeNames.returntypenames001
* nsk.jdi.Method.returnTypeNames.returntypenames001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.returnTypeNames.returntypenames001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames002.java
index 07a5de29f2e..efbd84d92fb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,7 +69,9 @@ public class returntypenames002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames002/TestDescription.java
index 4c8674a9dc1..6a44cfe8b5f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.Method.returnTypeNames.returntypenames002
* nsk.jdi.Method.returnTypeNames.returntypenames002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.returnTypeNames.returntypenames002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames003.java
index c0ef84b150f..94e6de52055 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -83,7 +83,9 @@ public class returntypenames003 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames003/TestDescription.java
index e06fbd786f3..df94aba4ae7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.Method.returnTypeNames.returntypenames003
* nsk.jdi.Method.returnTypeNames.returntypenames003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.returnTypeNames.returntypenames003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables001.java
index 7974d796b5a..68bac0c7170 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -63,7 +63,9 @@ public class variables001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables001/TestDescription.java
index 09d8c5db9a3..8a54d7e4409 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -90,7 +90,7 @@
* @clean nsk.jdi.Method.variables.variables001a
* @compile -g:lines,source,vars ../variables001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.variables.variables001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables002.java
index a7bedaf2823..804ce68585c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -60,7 +60,9 @@ public class variables002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables002/TestDescription.java
index d41cb628aa2..5da2614fd4f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.Method.variables.variables002
* nsk.jdi.Method.variables.variables002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.variables.variables002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname001.java
index da1c314f057..048b3e7379c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -64,7 +64,9 @@ public class variablesbyname001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname001/TestDescription.java
index 74647794b10..961c7977600 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -87,7 +87,7 @@
* @clean nsk.jdi.Method.variablesByName.variablesbyname001a
* @compile -g:lines,source,vars ../variablesbyname001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.variablesByName.variablesbyname001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname002.java
index 8e706cb7fe7..c3507478117 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -60,7 +60,9 @@ public class variablesbyname002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname002/TestDescription.java
index 6c9a2b6f5e2..8a1293c4781 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.Method.variablesByName.variablesbyname002
* nsk.jdi.Method.variablesByName.variablesbyname002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Method.variablesByName.variablesbyname002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001.java
index 98297db3148..c9d55bf1d25 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,8 +85,11 @@ public class method001 {
static private volatile boolean testFailed, eventReceived;
// start test from command line
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
// start test from JCK-compatible environment
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001/TestDescription.java
index fcf885e8232..55b98a9cb9e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -82,7 +82,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryEvent.method.method001
* nsk.jdi.MethodEntryEvent.method.method001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryEvent.method.method001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002.java
index 2d67b0b95e8..20a1cfb6cdf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,8 +87,11 @@ public class method002 {
static private int eventsCount;
// start test from command line
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
// start test from JCK-compatible environment
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002/TestDescription.java
index 9f30bb69ed4..0b8db20859d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -82,7 +82,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryEvent.method.method002
* nsk.jdi.MethodEntryEvent.method.method002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryEvent.method.method002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/_bounds_/filters001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/_bounds_/filters001.java
index 6cdca54c742..9beb0d30fc7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/_bounds_/filters001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/_bounds_/filters001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -60,7 +60,10 @@ public class filters001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/_bounds_/filters001/TestDescription.java
index 85f297b6aa4..bbdaaa789c0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/_bounds_/filters001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/_bounds_/filters001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -46,7 +46,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryRequest._bounds_.filters001
* nsk.jdi.MethodEntryRequest._bounds_.filters001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryRequest._bounds_.filters001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter001.java
index 8e87e5049fc..c47e5cbde9e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -64,7 +64,10 @@ import java.io.*;
public class filter001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter001/TestDescription.java
index ee02b8a2c25..6353224ff96 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryRequest.addClassExclusionFilter.filter001
* nsk.jdi.MethodEntryRequest.addClassExclusionFilter.filter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryRequest.addClassExclusionFilter.filter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002.java
index b9fd6955d67..5fef3066c44 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,9 @@ public class filter002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002/TestDescription.java
index 754fb0bbc17..5f2dfebd9c6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryRequest.addClassExclusionFilter.filter002
* nsk.jdi.MethodEntryRequest.addClassExclusionFilter.filter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryRequest.addClassExclusionFilter.filter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt001.java
index e25b0b202e0..bdacb7f801f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -74,7 +74,10 @@ import java.io.*;
public class filter_rt001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt001/TestDescription.java
index 5ac05ec1940..d833a16fe90 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryRequest.addClassFilter_rt.filter_rt001
* nsk.jdi.MethodEntryRequest.addClassFilter_rt.filter_rt001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryRequest.addClassFilter_rt.filter_rt001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002.java
index a230fa16951..1d83e104b72 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class filter_rt002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002/TestDescription.java
index f0db7765ffc..bf48e9b08d2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryRequest.addClassFilter_rt.filter_rt002
* nsk.jdi.MethodEntryRequest.addClassFilter_rt.filter_rt002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryRequest.addClassFilter_rt.filter_rt002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt003.java
index 0b7eee0174f..14fbf83a0e6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -78,7 +78,10 @@ import java.io.*;
public class filter_rt003 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt003/TestDescription.java
index b910bf9bdf7..7548204189b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryRequest.addClassFilter_rt.filter_rt003
* nsk.jdi.MethodEntryRequest.addClassFilter_rt.filter_rt003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryRequest.addClassFilter_rt.filter_rt003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s001.java
index 79032f1e334..2f780929cca 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -65,7 +65,10 @@ import java.io.*;
public class filter_s001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s001/TestDescription.java
index 1a70150d30c..cbc94fa5736 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryRequest.addClassFilter_s.filter_s001
* nsk.jdi.MethodEntryRequest.addClassFilter_s.filter_s001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryRequest.addClassFilter_s.filter_s001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002.java
index e7a99c2bc70..7cb4c40ee47 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,9 @@ public class filter_s002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002/TestDescription.java
index 1d95b2623e1..fe7242bea7f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryRequest.addClassFilter_s.filter_s002
* nsk.jdi.MethodEntryRequest.addClassFilter_s.filter_s002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryRequest.addClassFilter_s.filter_s002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter001.java
index 20dd47dc62f..4e946062a9a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -70,7 +70,10 @@ import java.io.*;
public class instancefilter001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter001/TestDescription.java
index f8a0811de4e..d65de39d435 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter001
* nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002.java
index 32043b08494..3f013618ac9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class instancefilter002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002/TestDescription.java
index 4d7903bc8dd..97e566db0a2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter002
* nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003.java
index 23e6e61f738..67009ca963d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class instancefilter003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003/TestDescription.java
index 7b3c2c0e73d..82a36ccf910 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter003
* nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter004.java
index 247e96ea1b6..aa34cd6e053 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,7 +76,10 @@ import java.io.*;
public class instancefilter004 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter004/TestDescription.java
index 31feda94322..04bbe0d83a3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -79,7 +79,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter004
* nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter001.java
index 1b98c9ff6bd..0d9745957da 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -64,7 +64,10 @@ import java.io.*;
public class threadfilter001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter001/TestDescription.java
index fbea9e5c89a..42b1bb03f10 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter001
* nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002.java
index baead18cfc0..b889d75510b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -90,7 +90,9 @@ public class threadfilter002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002/TestDescription.java
index 5f862162c91..aa8deb83cce 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter002
* nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003.java
index 0b5d97ef012..161190a7abd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -90,7 +90,9 @@ public class threadfilter003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003/TestDescription.java
index e51d9470be5..efdb7afa17f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter003
* nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter004.java
index 78483dd5219..16d119b0eca 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -74,7 +74,10 @@ import java.io.*;
public class threadfilter004 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter004/TestDescription.java
index 8d7e876850f..e8ab395fb50 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter004
* nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/_itself_/methodexit001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/_itself_/methodexit001.java
index 874c930d646..ebbd40d5052 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/_itself_/methodexit001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/_itself_/methodexit001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -81,8 +81,11 @@ public class methodexit001 {
static private volatile boolean testFailed, eventReceived;
// start test from command line
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
// start test from JCK-compatible environment
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/_itself_/methodexit001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/_itself_/methodexit001/TestDescription.java
index 1528658418d..fe88a302acb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/_itself_/methodexit001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/_itself_/methodexit001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.MethodExitEvent._itself_.methodexit001
* nsk.jdi.MethodExitEvent._itself_.methodexit001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitEvent._itself_.methodexit001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001.java
index 510965ac480..a1515979a18 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,8 +84,11 @@ public class method001 {
static private volatile boolean testFailed, eventReceived;
// start test from command line
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
// start test from JCK-compatible environment
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001/TestDescription.java
index cb557825dfa..32865333409 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -81,7 +81,7 @@
* /test/lib
* @build nsk.jdi.MethodExitEvent.method.method001
* nsk.jdi.MethodExitEvent.method.method001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitEvent.method.method001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002.java
index f6b61c1e872..0f0bd3773f3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,8 +88,11 @@ public class method002 {
static private int eventsCount;
// start test from command line
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
// start test from JCK-compatible environment
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002/TestDescription.java
index 6a7dfd9b89f..a8a286371f1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -82,7 +82,7 @@
* /test/lib
* @build nsk.jdi.MethodExitEvent.method.method002
* nsk.jdi.MethodExitEvent.method.method002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitEvent.method.method002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue001/returnValue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue001/returnValue001.java
index 0baa005e500..0de5e19d0c9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue001/returnValue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue001/returnValue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -46,7 +46,7 @@
* /test/lib
* @build nsk.jdi.MethodExitEvent.returnValue.returnValue001.returnValue001
* nsk.jdi.MethodExitEvent.returnValue.returnValue001.returnValue001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitEvent.returnValue.returnValue001.returnValue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -88,7 +88,10 @@ import nsk.share.jpda.ForceEarlyReturnTestThread;
public class returnValue001 extends TestDebuggerType2 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue002/returnValue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue002/returnValue002.java
index 734ca5f1016..2a5f7b230fd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue002/returnValue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue002/returnValue002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -36,7 +36,7 @@
* /test/lib
* @build nsk.jdi.MethodExitEvent.returnValue.returnValue002.returnValue002
* nsk.jdi.MethodExitEvent.returnValue.returnValue002.returnValue002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitEvent.returnValue.returnValue002.returnValue002
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -60,7 +60,10 @@ import nsk.share.jdi.*;
*/
public class returnValue002 extends TestDebuggerType2 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue003/returnValue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue003/returnValue003.java
index 5a3ee68e529..0814c9b1940 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue003/returnValue003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue003/returnValue003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -47,7 +47,7 @@
* /test/lib
* @build nsk.jdi.MethodExitEvent.returnValue.returnValue003.returnValue003
* nsk.jdi.MethodExitEvent.returnValue.returnValue003.returnValue003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitEvent.returnValue.returnValue003.returnValue003
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -124,7 +124,10 @@ public class returnValue003 extends TestDebuggerType2 {
}
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue004/returnValue004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue004/returnValue004.java
index 5ab4cceac2e..6199b831faf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue004/returnValue004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue004/returnValue004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -91,7 +91,10 @@ import nsk.share.jpda.NativeMethodsTestThread;
public class returnValue004 extends TestDebuggerType2 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/_bounds_/filters001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/_bounds_/filters001.java
index 5a663348ae0..3ccb01a1872 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/_bounds_/filters001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/_bounds_/filters001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -60,7 +60,10 @@ public class filters001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/_bounds_/filters001/TestDescription.java
index ee4984368f8..d13d8574dc4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/_bounds_/filters001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/_bounds_/filters001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -46,7 +46,7 @@
* /test/lib
* @build nsk.jdi.MethodExitRequest._bounds_.filters001
* nsk.jdi.MethodExitRequest._bounds_.filters001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitRequest._bounds_.filters001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter001.java
index d9d2d9d21dc..ee391c0430a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -64,7 +64,10 @@ import java.io.*;
public class filter001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter001/TestDescription.java
index 61328385516..e2cbf933c66 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.MethodExitRequest.addClassExclusionFilter.filter001
* nsk.jdi.MethodExitRequest.addClassExclusionFilter.filter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitRequest.addClassExclusionFilter.filter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002.java
index 84d05550a64..75f7ad3a523 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,9 @@ public class filter002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002/TestDescription.java
index 3a78b5d7041..911c348cf5c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.MethodExitRequest.addClassExclusionFilter.filter002
* nsk.jdi.MethodExitRequest.addClassExclusionFilter.filter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitRequest.addClassExclusionFilter.filter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt001.java
index 59e4f1d2ff7..03f87e011a1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -74,7 +74,10 @@ import java.io.*;
public class filter_rt001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt001/TestDescription.java
index a7c2430c54e..b8e20d57140 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.MethodExitRequest.addClassFilter_rt.filter_rt001
* nsk.jdi.MethodExitRequest.addClassFilter_rt.filter_rt001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitRequest.addClassFilter_rt.filter_rt001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002.java
index f96b53a71ff..374ebace2ff 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class filter_rt002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002/TestDescription.java
index b51a1511978..3e9e2730a74 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.MethodExitRequest.addClassFilter_rt.filter_rt002
* nsk.jdi.MethodExitRequest.addClassFilter_rt.filter_rt002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitRequest.addClassFilter_rt.filter_rt002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt003.java
index c9247f89651..31af6e4d590 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -78,7 +78,10 @@ import java.io.*;
public class filter_rt003 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt003/TestDescription.java
index b8338a02948..5d83a6138b1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.MethodExitRequest.addClassFilter_rt.filter_rt003
* nsk.jdi.MethodExitRequest.addClassFilter_rt.filter_rt003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitRequest.addClassFilter_rt.filter_rt003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s001.java
index a3cee6877eb..3ecd124bbdf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -65,7 +65,10 @@ import java.io.*;
public class filter_s001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s001/TestDescription.java
index a7807950386..6fdce96b62c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.MethodExitRequest.addClassFilter_s.filter_s001
* nsk.jdi.MethodExitRequest.addClassFilter_s.filter_s001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitRequest.addClassFilter_s.filter_s001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002.java
index 5c8cf1067ea..3d243865d1a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,9 @@ public class filter_s002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002/TestDescription.java
index d92bd09266b..93e9f0ba66f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.MethodExitRequest.addClassFilter_s.filter_s002
* nsk.jdi.MethodExitRequest.addClassFilter_s.filter_s002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitRequest.addClassFilter_s.filter_s002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter001.java
index 6cd7455ec8d..c768e4ee470 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -70,7 +70,10 @@ import java.io.*;
public class instancefilter001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter001/TestDescription.java
index eaadbc5f077..b2e2700c97b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter001
* nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002.java
index cab4734e3d0..25ccf74fe0d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class instancefilter002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002/TestDescription.java
index 55bd1cf39a6..0429828dc8d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter002
* nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003.java
index 517257f03e0..33d8d261291 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class instancefilter003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003/TestDescription.java
index 6291d6f66b7..c9e56c090f9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter003
* nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter004.java
index 9c2a497b1e1..1717f8f899d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,7 +76,10 @@ import java.io.*;
public class instancefilter004 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter004/TestDescription.java
index 8478efa6101..5fdc619ab62 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -79,7 +79,7 @@
* /test/lib
* @build nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter004
* nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter001.java
index 84a1fac28d3..c32775316cc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -64,7 +64,10 @@ import java.io.*;
public class threadfilter001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter001/TestDescription.java
index 4efa002520c..1142eefefd7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter001
* nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002.java
index 63f21d6556b..b87bfba5fa6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -89,7 +89,9 @@ public class threadfilter002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002/TestDescription.java
index d2f95215d86..164ddcb59c1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter002
* nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003.java
index 175410b01f0..b09d7f46f9e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -89,7 +89,9 @@ public class threadfilter003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003/TestDescription.java
index fde548a189d..f97207868c7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter003
* nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter004.java
index 133470ce684..98b0a78d58f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -74,7 +74,10 @@ import java.io.*;
public class threadfilter004 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter004/TestDescription.java
index 936232d514a..64d0283fd3e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter004
* nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/hashCode/hashcode001.java
index 332203964dc..c8b8e418aaf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -64,7 +64,10 @@ public class hashcode001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/hashCode/hashcode001/TestDescription.java
index 7fec0159a6d..4aed3bcd180 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.Mirror.hashCode.hashcode001
* nsk.jdi.Mirror.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Mirror.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/toString/tostring001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/toString/tostring001.java
index 34430a1d25e..f12f31f160c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/toString/tostring001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/toString/tostring001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class tostring001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/toString/tostring001/TestDescription.java
index ef19da51c9e..945acf23519 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/toString/tostring001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/toString/tostring001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.Mirror.toString.tostring001
* nsk.jdi.Mirror.toString.tostring001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Mirror.toString.tostring001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/virtualMachine/virtualmachine001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/virtualMachine/virtualmachine001.java
index 9a9d48139bb..ededbac932d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/virtualMachine/virtualmachine001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/virtualMachine/virtualmachine001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class virtualmachine001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/virtualMachine/virtualmachine001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/virtualMachine/virtualmachine001/TestDescription.java
index 7035d64cdbc..06a9f1df6fc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/virtualMachine/virtualmachine001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/virtualMachine/virtualmachine001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.Mirror.virtualMachine.virtualmachine001
* nsk.jdi.Mirror.virtualMachine.virtualmachine001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Mirror.virtualMachine.virtualmachine001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001.java
index 6a192280ec3..42a1e08eb3b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class mwevent001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001/TestDescription.java
index d15622d5ba1..324f768653c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* /test/lib
* @build nsk.jdi.ModificationWatchpointEvent._itself_.mwevent001
* nsk.jdi.ModificationWatchpointEvent._itself_.mwevent001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ModificationWatchpointEvent._itself_.mwevent001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe001.java
index 0fe8b7904bf..9eacc79447d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -68,8 +68,11 @@ public class valuetobe001 {
static private volatile boolean done;
static private volatile int requestsCount, mwpEventsCount;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe001/TestDescription.java
index a24fafc2a0d..1c995857cb0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -76,7 +76,7 @@
* /test/lib
* @build nsk.jdi.ModificationWatchpointEvent.valueToBe.valuetobe001
* nsk.jdi.ModificationWatchpointEvent.valueToBe.valuetobe001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ModificationWatchpointEvent.valueToBe.valuetobe001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe002.java
index 230277030c5..7a9352a4f70 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -68,8 +68,11 @@ public class valuetobe002 {
static private volatile boolean done;
static private volatile int requestsCount, mwpEventsCount;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe002/TestDescription.java
index f3fc8c3c1d7..89ebc2deeb2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -77,7 +77,7 @@
* /test/lib
* @build nsk.jdi.ModificationWatchpointEvent.valueToBe.valuetobe002
* nsk.jdi.ModificationWatchpointEvent.valueToBe.valuetobe002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ModificationWatchpointEvent.valueToBe.valuetobe002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest001/TestDescription.java
index a3861420ad0..68115826283 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* @build nsk.share.jdi.StressTestTemplate
* nsk.share.jdi.JDIEventsDebuggee
* nsk.share.jdi.MonitorEventsDebuggee
- * @run main/othervm
+ * @run driver
* nsk.share.jdi.StressTestTemplate
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest002/TestDescription.java
index ec9b3612b35..0f5eb2de9e2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* @build nsk.share.jdi.StressTestTemplate
* nsk.share.jdi.JDIEventsDebuggee
* nsk.share.jdi.MonitorEventsDebuggee
- * @run main/othervm
+ * @run driver
* nsk.share.jdi.StressTestTemplate
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassExclusionFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassExclusionFilter/TestDescription.java
index fb06821237c..2e77f351039 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassExclusionFilter/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassExclusionFilter/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* @build nsk.share.jdi.ClassExclusionFilterTest
* nsk.share.jdi.JDIEventsDebuggee
* nsk.share.jdi.MonitorEventsDebuggee
- * @run main/othervm
+ * @run driver
* nsk.share.jdi.ClassExclusionFilterTest
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ClassName/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ClassName/TestDescription.java
index 009df67f525..e58055f70a7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ClassName/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ClassName/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* @build nsk.share.jdi.ClassFilterTest_ClassName
* nsk.share.jdi.JDIEventsDebuggee
* nsk.share.jdi.MonitorEventsDebuggee
- * @run main/othervm
+ * @run driver
* nsk.share.jdi.ClassFilterTest_ClassName
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ReferenceType/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ReferenceType/TestDescription.java
index 0757315f179..f9d8b06d0eb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ReferenceType/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ReferenceType/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* @build nsk.share.jdi.ClassFilterTest_ReferenceType
* nsk.share.jdi.JDIEventsDebuggee
* nsk.share.jdi.MonitorEventsDebuggee
- * @run main/othervm
+ * @run driver
* nsk.share.jdi.ClassFilterTest_ReferenceType
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addInstanceFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addInstanceFilter/TestDescription.java
index ed4a1326690..2d3a98a568f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addInstanceFilter/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addInstanceFilter/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* @build nsk.share.jdi.InstanceFilterTest
* nsk.share.jdi.JDIEventsDebuggee
* nsk.share.jdi.MonitorEventsDebuggee
- * @run main/othervm
+ * @run driver
* nsk.share.jdi.InstanceFilterTest
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addThreadFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addThreadFilter/TestDescription.java
index 990524ab8fc..b94d165a64a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addThreadFilter/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addThreadFilter/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* @build nsk.share.jdi.ThreadFilterTest
* nsk.share.jdi.JDIEventsDebuggee
* nsk.share.jdi.MonitorEventsDebuggee
- * @run main/othervm
+ * @run driver
* nsk.share.jdi.ThreadFilterTest
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest001/TestDescription.java
index 74ddb06a62b..0900b9dfe27 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* @build nsk.share.jdi.StressTestTemplate
* nsk.share.jdi.JDIEventsDebuggee
* nsk.share.jdi.MonitorEventsDebuggee
- * @run main/othervm
+ * @run driver
* nsk.share.jdi.StressTestTemplate
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest002/TestDescription.java
index 22cbf3a4bd8..c99d091573f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* @build nsk.share.jdi.StressTestTemplate
* nsk.share.jdi.JDIEventsDebuggee
* nsk.share.jdi.MonitorEventsDebuggee
- * @run main/othervm
+ * @run driver
* nsk.share.jdi.StressTestTemplate
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassExclusionFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassExclusionFilter/TestDescription.java
index 3202b48666c..4965761b5a9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassExclusionFilter/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassExclusionFilter/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* @build nsk.share.jdi.ClassExclusionFilterTest
* nsk.share.jdi.JDIEventsDebuggee
* nsk.share.jdi.MonitorEventsDebuggee
- * @run main/othervm
+ * @run driver
* nsk.share.jdi.ClassExclusionFilterTest
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ClassName/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ClassName/TestDescription.java
index e369acfb4f9..e093aac4db3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ClassName/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ClassName/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* @build nsk.share.jdi.ClassFilterTest_ClassName
* nsk.share.jdi.JDIEventsDebuggee
* nsk.share.jdi.MonitorEventsDebuggee
- * @run main/othervm
+ * @run driver
* nsk.share.jdi.ClassFilterTest_ClassName
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ReferenceType/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ReferenceType/TestDescription.java
index 38af683aa7d..7179bd13343 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ReferenceType/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ReferenceType/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* @build nsk.share.jdi.ClassFilterTest_ReferenceType
* nsk.share.jdi.JDIEventsDebuggee
* nsk.share.jdi.MonitorEventsDebuggee
- * @run main/othervm
+ * @run driver
* nsk.share.jdi.ClassFilterTest_ReferenceType
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addInstanceFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addInstanceFilter/TestDescription.java
index 56b2deb3d72..9f5baef9d78 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addInstanceFilter/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addInstanceFilter/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* @build nsk.share.jdi.InstanceFilterTest
* nsk.share.jdi.JDIEventsDebuggee
* nsk.share.jdi.MonitorEventsDebuggee
- * @run main/othervm
+ * @run driver
* nsk.share.jdi.InstanceFilterTest
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addThreadFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addThreadFilter/TestDescription.java
index 7bb5b22d612..6bc308a3a76 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addThreadFilter/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addThreadFilter/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* @build nsk.share.jdi.ThreadFilterTest
* nsk.share.jdi.JDIEventsDebuggee
* nsk.share.jdi.MonitorEventsDebuggee
- * @run main/othervm
+ * @run driver
* nsk.share.jdi.ThreadFilterTest
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds001.java
index 595d52e167d..922b2974338 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -77,7 +77,10 @@ public class bounds001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds001/TestDescription.java
index 689e54b5991..e3cd8ecce7c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference._bounds_.bounds001
* nsk.jdi.ObjectReference._bounds_.bounds001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference._bounds_.bounds001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds002.java
index 5ea2cb6e3f0..14834b41cff 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -65,7 +65,10 @@ public class bounds002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds002/TestDescription.java
index 7f1fe909e41..375d3ae4fc7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -46,7 +46,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference._bounds_.bounds002
* nsk.jdi.ObjectReference._bounds_.bounds002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference._bounds_.bounds002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds003.java
index e209ffee69c..be6fc0d38a9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -123,7 +123,10 @@ public class bounds003 extends ValueConversionDebugger {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds003/TestDescription.java
index f12cea02f53..836881c725c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -44,7 +44,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference._bounds_.bounds003
* nsk.jdi.ObjectReference._bounds_.bounds003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference._bounds_.bounds003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection001.java
index 4b3d05c0ba2..546f68e8c94 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -61,7 +61,9 @@ public class disablecollection001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection001/TestDescription.java
index 59002767d40..6277c64fae7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.disableCollection.disablecollection001
* nsk.jdi.ObjectReference.disableCollection.disablecollection001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.disableCollection.disablecollection001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002.java
index 732b1e0a06f..89dcfde4d99 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -103,7 +103,9 @@ public class disablecollection002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002/TestDescription.java
index ea1073e6f88..fd84f85afab 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -75,7 +75,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.disableCollection.disablecollection002
* nsk.jdi.ObjectReference.disableCollection.disablecollection002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.disableCollection.disablecollection002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount001.java
index e5ebcdf1947..56797162229 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -62,7 +62,9 @@ public class entrycount001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount001/TestDescription.java
index e3fad22e173..0f463031da1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.entryCount.entrycount001
* nsk.jdi.ObjectReference.entryCount.entrycount001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.entryCount.entrycount001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002.java
index a069b9bc2cc..7736eae1d2b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -70,7 +70,10 @@ public class entrycount002 {
//------------------------------------------------------ immutable common methods
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + PASS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
//------------------------------------------------------ test specific fields
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002/TestDescription.java
index c442976413b..7c815cb0149 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.entryCount.entrycount002
* nsk.jdi.ObjectReference.entryCount.entrycount002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.entryCount.entrycount002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/equals/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/equals/equals001.java
index be7a3bd8bf2..1623b0d4066 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/equals/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/equals/equals001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,7 +69,9 @@ public class equals001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/equals/equals001/TestDescription.java
index 89a33c375ea..125863e56a8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/equals/equals001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/equals/equals001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.equals.equals001
* nsk.jdi.ObjectReference.equals.equals001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.equals.equals001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001.java
index 99ba34ca25b..6c2e0e37db5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,7 +75,9 @@ public class getvalue001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001/TestDescription.java
index cb3687b09bb..2918584eb5a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.getValue.getvalue001
* nsk.jdi.ObjectReference.getValue.getvalue001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.getValue.getvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002.java
index dfab92cd3c5..cf137dd5785 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -74,7 +74,9 @@ public class getvalue002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002/TestDescription.java
index 815d8056e73..ac5a6a75899 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -77,7 +77,7 @@
* @clean nsk.jdi.ObjectReference.getValue.getvalue002a
* @compile -g:lines,source,vars ../getvalue002a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.getValue.getvalue002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003.java
index 07ea746db4f..ef1a8d71c17 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -65,7 +65,9 @@ public class getvalue003 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003/TestDescription.java
index 57131adfab7..bd158180779 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.getValue.getvalue003
* nsk.jdi.ObjectReference.getValue.getvalue003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.getValue.getvalue003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue004.java
index e0ee7ba4b99..a0360cf0254 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -65,7 +65,9 @@ public class getvalue004 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue004/TestDescription.java
index 72e1ac9ba9e..0d0473ce74a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.getValue.getvalue004
* nsk.jdi.ObjectReference.getValue.getvalue004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.getValue.getvalue004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001.java
index 7a942a4bfed..db4f6ccf434 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,7 +69,9 @@ public class getvalues001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001/TestDescription.java
index f751c7af846..22be1dc8f0f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.getValues.getvalues001
* nsk.jdi.ObjectReference.getValues.getvalues001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.getValues.getvalues001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002.java
index 20519e40824..462405f6a6c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,7 +69,9 @@ public class getvalues002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002/TestDescription.java
index bad4db9c79b..e13fd6b4333 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -73,7 +73,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.getValues.getvalues002
* nsk.jdi.ObjectReference.getValues.getvalues002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.getValues.getvalues002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003.java
index 07599022a17..cf0e99e4f58 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,7 +69,9 @@ public class getvalues003{
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003/TestDescription.java
index 146381468ca..e8ec83bd78f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.getValues.getvalues003
* nsk.jdi.ObjectReference.getValues.getvalues003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.getValues.getvalues003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/hashCode/hashcode001.java
index 44b424ce012..6cb8d6eb606 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,7 +69,9 @@ public class hashcode001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/hashCode/hashcode001/TestDescription.java
index 10e5af569a5..9d75466744a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.hashCode.hashcode001
* nsk.jdi.ObjectReference.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001.java
index 381703f5983..6fda6375ee2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class invokemethod001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001/TestDescription.java
index 2365baac7d7..8b30f5c58b5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.invokeMethod.invokemethod001
* nsk.jdi.ObjectReference.invokeMethod.invokemethod001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.invokeMethod.invokemethod001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002.java
index 09d3a26b2ae..a2b18608770 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -95,7 +95,10 @@ public class invokemethod002 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002/TestDescription.java
index a8508e23821..6e7f6fba0e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,7 @@
* @clean nsk.jdi.ObjectReference.invokeMethod.invokemethod002t
* @compile -g:lines,source,vars ../invokemethod002t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.invokeMethod.invokemethod002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003.java
index 366434f5c8d..d9b6f4b0ae7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -106,7 +106,10 @@ public class invokemethod003 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003/TestDescription.java
index e5470416e18..7dc341ab15b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,7 @@
* @clean nsk.jdi.ObjectReference.invokeMethod.invokemethod003t
* @compile -g:lines,source,vars ../invokemethod003t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.invokeMethod.invokemethod003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004.java
index 0b815182252..12006735008 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -82,7 +82,10 @@ public class invokemethod004 {
private int tot_res = Consts.TEST_PASSED;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004/TestDescription.java
index a87c206b50c..cb550646107 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -46,7 +46,7 @@
* @clean nsk.jdi.ObjectReference.invokeMethod.invokemethod004t
* @compile -g:lines,source,vars ../invokemethod004t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.invokeMethod.invokemethod004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005.java
index c6cb2c1aa88..4bcbac5d727 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -84,7 +84,10 @@ public class invokemethod005 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005/TestDescription.java
index 4bd11739aaa..f8bd4c9e75a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,7 @@
* @clean nsk.jdi.ObjectReference.invokeMethod.invokemethod005t
* @compile -g:lines,source,vars ../invokemethod005t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.invokeMethod.invokemethod005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006.java
index 90c324a99ea..40f828a0f3b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -82,7 +82,10 @@ public class invokemethod006 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006/TestDescription.java
index efbeeed74cb..c23b9c62a6b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* @clean nsk.jdi.ObjectReference.invokeMethod.invokemethod006t
* @compile -g:lines,source,vars ../invokemethod006t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.invokeMethod.invokemethod006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007.java
index 327c69d82d9..63be5be365e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -98,7 +98,10 @@ public class invokemethod007 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007/TestDescription.java
index bccd1c469e7..261b3472ffc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -46,7 +46,7 @@
* @clean nsk.jdi.ObjectReference.invokeMethod.invokemethod007t
* @compile -g:lines,source,vars ../invokemethod007t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.invokeMethod.invokemethod007
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008.java
index 3e0236c4f56..e26550203c4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -91,7 +91,10 @@ public class invokemethod008 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008/TestDescription.java
index 6c67e49071d..2f3f686d9ff 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -50,7 +50,7 @@
* @clean nsk.jdi.ObjectReference.invokeMethod.invokemethod008t
* @compile -g:lines,source,vars ../invokemethod008t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.invokeMethod.invokemethod008
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009.java
index ca4394d3682..703123ef076 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -91,7 +91,10 @@ public class invokemethod009 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009/TestDescription.java
index 55f590e4d1c..57e301d3bcb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* @clean nsk.jdi.ObjectReference.invokeMethod.invokemethod009t
* @compile -g:lines,source,vars ../invokemethod009t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.invokeMethod.invokemethod009
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010.java
index bfa2a50235c..032caa64fb7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -100,7 +100,10 @@ public class invokemethod010 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010/TestDescription.java
index dc5b5467985..951028bb112 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @clean nsk.jdi.ObjectReference.invokeMethod.invokemethod010t
* @compile -g:lines,source,vars ../invokemethod010t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.invokeMethod.invokemethod010
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011.java
index 1f7c038d397..5148529f4ac 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -100,7 +100,10 @@ public class invokemethod011 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011/TestDescription.java
index 4edc25608de..d152338e488 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* @clean nsk.jdi.ObjectReference.invokeMethod.invokemethod011t
* @compile -g:lines,source,vars ../invokemethod011t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.invokeMethod.invokemethod011
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012.java
index a8de6497684..e618d9ad0c0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -106,7 +106,10 @@ public class invokemethod012 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012/TestDescription.java
index 40163501cd8..b39a8723c9f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* @clean nsk.jdi.ObjectReference.invokeMethod.invokemethod012t
* @compile -g:lines,source,vars ../invokemethod012t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.invokeMethod.invokemethod012
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013.java
index ffa71463963..e5eb6911f03 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -105,7 +105,10 @@ public class invokemethod013 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013/TestDescription.java
index b3454866996..b18bc0a9fb1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* @clean nsk.jdi.ObjectReference.invokeMethod.invokemethod013t
* @compile -g:lines,source,vars ../invokemethod013t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.invokeMethod.invokemethod013
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014.java
index 01e3fe6f950..5d7d4f3b66e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -114,7 +114,10 @@ public class invokemethod014 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014/TestDescription.java
index 19be546661e..941bad5cce6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* @clean nsk.jdi.ObjectReference.invokeMethod.invokemethod014t
* @compile -g:lines,source,vars ../invokemethod014t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.invokeMethod.invokemethod014
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/isCollected/iscollected001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/isCollected/iscollected001.java
index 0d4c20dcbad..8d527df9a44 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/isCollected/iscollected001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/isCollected/iscollected001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -60,7 +60,9 @@ public class iscollected001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/isCollected/iscollected001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/isCollected/iscollected001/TestDescription.java
index f3d9b8b37d4..ff9f0b79e19 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/isCollected/iscollected001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/isCollected/iscollected001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.isCollected.iscollected001
* nsk.jdi.ObjectReference.isCollected.iscollected001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.isCollected.iscollected001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001.java
index 6f1260d23a8..f76e238083b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -62,7 +62,9 @@ public class owningthread001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001/TestDescription.java
index 9037e0e2deb..f3abee62008 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.owningThread.owningthread001
* nsk.jdi.ObjectReference.owningThread.owningthread001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.owningThread.owningthread001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002.java
index 04bb390ef79..89d1b703310 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -70,7 +70,10 @@ public class owningthread002 {
//------------------------------------------------------ immutable common methods
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + PASS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
//------------------------------------------------------ test specific fields
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002/TestDescription.java
index b38ac5fc480..45cf3bae733 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.owningThread.owningthread002
* nsk.jdi.ObjectReference.owningThread.owningthread002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.owningThread.owningthread002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001.java
index fe644433874..3acfeef10c3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class referencetype001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001/TestDescription.java
index 035cf7cb634..df29f7e53e2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.referenceType.referencetype001
* nsk.jdi.ObjectReference.referenceType.referencetype001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.referenceType.referencetype001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype002.java
index 1cb532f088f..3f5e4136ea1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class referencetype002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype002/TestDescription.java
index 5c7c7cb50b5..e7f1c22f897 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.referenceType.referencetype002
* nsk.jdi.ObjectReference.referenceType.referencetype002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.referenceType.referencetype002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype003.java
index 92755a1f9a2..4679e117770 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class referencetype003 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype003/TestDescription.java
index 659e58048f5..952575bc9a9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.referenceType.referencetype003
* nsk.jdi.ObjectReference.referenceType.referencetype003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.referenceType.referencetype003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype004.java
index 1c6e4508745..47c623eba56 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class referencetype004 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype004/TestDescription.java
index a22e7f797f9..3c9d308c944 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.referenceType.referencetype004
* nsk.jdi.ObjectReference.referenceType.referencetype004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.referenceType.referencetype004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype005.java
index dfcc40188a2..f925940463c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,9 @@ public class referencetype005 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype005/TestDescription.java
index dca6ec10464..06ed5d8b323 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.referenceType.referencetype005
* nsk.jdi.ObjectReference.referenceType.referencetype005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.referenceType.referencetype005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype006.java
index f47a33c3122..4a084dce7a9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,9 @@ public class referencetype006 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype006/TestDescription.java
index e7830397f2c..472eb0c9b1e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.referenceType.referencetype006
* nsk.jdi.ObjectReference.referenceType.referencetype006a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.referenceType.referencetype006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype007.java
index fac06204a2e..949c7847334 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype007.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,9 @@ public class referencetype007 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype007/TestDescription.java
index 1cc82723cf0..d4327d09899 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype007/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.referenceType.referencetype007
* nsk.jdi.ObjectReference.referenceType.referencetype007a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.referenceType.referencetype007
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java
index 4079de50ea0..7e73bace342 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -82,7 +82,10 @@ import nsk.share.jpda.AbstractDebuggeeTest;
public class referringObjects001 extends HeapwalkingDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java
index e616df6797a..dc0bc9fe2d3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -82,7 +82,10 @@ import nsk.share.jdi.HeapwalkingDebugger;
public class referringObjects002 extends HeapwalkingDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects003/referringObjects003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects003/referringObjects003.java
index 4b52973ec80..862600dc697 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects003/referringObjects003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects003/referringObjects003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -80,7 +80,10 @@ import nsk.share.jpda.AbstractDebuggeeTest;
public class referringObjects003 extends HeapwalkingDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects004/referringObjects004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects004/referringObjects004.java
index 853b07c4def..7188364c51b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects004/referringObjects004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects004/referringObjects004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -66,7 +66,10 @@ import nsk.share.jdi.TestClass1;
public class referringObjects004 extends HeapwalkingDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue001.java
index 9abde1197a1..3494a1dcab7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -60,7 +60,9 @@ public class setvalue001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue001/TestDescription.java
index 1e7ebe480cb..4eeae02f56c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -86,7 +86,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.setValue.setvalue001
* nsk.jdi.ObjectReference.setValue.setvalue001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.setValue.setvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002.java
index ea59d879954..ed2ea7dc525 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -80,7 +80,10 @@ public class setvalue002 {
private int tot_res = Consts.TEST_PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002/TestDescription.java
index 7095623e9d6..97e285bccdd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* @clean nsk.jdi.ObjectReference.setValue.setvalue002t
* @compile -g:lines,source,vars ../setvalue002t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.setValue.setvalue002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003.java
index e922d6e8466..1496a672f92 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -112,7 +112,10 @@ public class setvalue003 {
private int tot_res = Consts.TEST_PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003/TestDescription.java
index 4c60d25d706..bc762b1425e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* @clean nsk.jdi.ObjectReference.setValue.setvalue003t
* @compile -g:lines,source,vars ../setvalue003t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.setValue.setvalue003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004.java
index d14b635c39f..ab20e5f93e7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -92,7 +92,10 @@ public class setvalue004 {
private int tot_res = Consts.TEST_PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004/TestDescription.java
index 4a235d491ad..fbc4934172d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -44,7 +44,7 @@
* @clean nsk.jdi.ObjectReference.setValue.setvalue004t
* @compile -g:lines,source,vars ../setvalue004t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.setValue.setvalue004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005.java
index 512486882f3..3c8525093ad 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -79,7 +79,10 @@ public class setvalue005 {
private int tot_res = Consts.TEST_PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005/TestDescription.java
index c49d025c2f6..b96d61f179e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* @clean nsk.jdi.ObjectReference.setValue.setvalue005t
* @compile -g:lines,source,vars ../setvalue005t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.setValue.setvalue005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/uniqueID/uniqueid001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/uniqueID/uniqueid001.java
index ad5e91ed09f..97088198498 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/uniqueID/uniqueid001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/uniqueID/uniqueid001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -59,7 +59,9 @@ public class uniqueid001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/uniqueID/uniqueid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/uniqueID/uniqueid001/TestDescription.java
index a335c1b6ba9..eba9ea9f9d4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/uniqueID/uniqueid001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/uniqueID/uniqueid001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.uniqueID.uniqueid001
* nsk.jdi.ObjectReference.uniqueID.uniqueid001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.uniqueID.uniqueid001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads001.java
index c7aa0e54e7a..69abe0903a9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -62,7 +62,9 @@ public class waitingthreads001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads001/TestDescription.java
index e82c6f8993e..1939924c889 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -75,7 +75,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.waitingThreads.waitingthreads001
* nsk.jdi.ObjectReference.waitingThreads.waitingthreads001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.waitingThreads.waitingthreads001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002.java
index 531279db92f..356f78876aa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -62,7 +62,10 @@ public class waitingthreads002 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002/TestDescription.java
index d09574d0c34..0edb28dd0e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.waitingThreads.waitingthreads002
* nsk.jdi.ObjectReference.waitingThreads.waitingthreads002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.waitingThreads.waitingthreads002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads003.java
index 832b3521e95..13961000b31 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -62,7 +62,10 @@ public class waitingthreads003 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads003/TestDescription.java
index cd1d7667117..b2a00b3a7cb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.waitingThreads.waitingthreads003
* nsk.jdi.ObjectReference.waitingThreads.waitingthreads003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.waitingThreads.waitingthreads003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads004.java
index 311e20d2f10..69a7083904d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads004.java
@@ -62,7 +62,10 @@ public class waitingthreads004 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads004/TestDescription.java
index 7e332961ba9..7c616fc1064 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.ObjectReference.waitingThreads.waitingthreads004
* nsk.jdi.ObjectReference.waitingThreads.waitingthreads004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ObjectReference.waitingThreads.waitingthreads004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/baseDirectory/directory001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/baseDirectory/directory001.java
index 52bed498021..8711c5b39ac 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/baseDirectory/directory001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/baseDirectory/directory001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -62,7 +62,9 @@ public class directory001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/baseDirectory/directory001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/baseDirectory/directory001/TestDescription.java
index 55b722602cf..37fef25d142 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/baseDirectory/directory001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/baseDirectory/directory001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* /test/lib
* @build nsk.jdi.PathSearchingVirtualMachine.baseDirectory.directory001
* nsk.jdi.PathSearchingVirtualMachine.baseDirectory.directory001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.PathSearchingVirtualMachine.baseDirectory.directory001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/bootClassPath/bootpath001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/bootClassPath/bootpath001.java
index 7c63fc918c5..f7b362ba4c3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/bootClassPath/bootpath001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/bootClassPath/bootpath001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -63,7 +63,9 @@ public class bootpath001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/bootClassPath/bootpath001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/bootClassPath/bootpath001/TestDescription.java
index abfbed71883..e2c4573e26f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/bootClassPath/bootpath001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/bootClassPath/bootpath001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.PathSearchingVirtualMachine.bootClassPath.bootpath001
* nsk.jdi.PathSearchingVirtualMachine.bootClassPath.bootpath001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.PathSearchingVirtualMachine.bootClassPath.bootpath001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001.java
index fbc29a47de2..97908175e7b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class classpath001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001/TestDescription.java
index a5878ca5349..9a9e353d258 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.PathSearchingVirtualMachine.classPath.classpath001
* nsk.jdi.PathSearchingVirtualMachine.classPath.classpath001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.PathSearchingVirtualMachine.classPath.classpath001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001.java
index fa13f624406..a3c32fb0d27 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -78,7 +78,9 @@ public class primitivetype001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001/TestDescription.java
index d2096854fe9..61198bf3bc1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.PrimitiveType._itself_.primitivetype001
* nsk.jdi.PrimitiveType._itself_.primitivetype001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.PrimitiveType._itself_.primitivetype001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/booleanValue/booleanvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/booleanValue/booleanvalue001.java
index 62131e5b1f6..9ee9067b0d7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/booleanValue/booleanvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/booleanValue/booleanvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -96,7 +96,9 @@ public class booleanvalue001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/booleanValue/booleanvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/booleanValue/booleanvalue001/TestDescription.java
index e03076678c0..e863288fa38 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/booleanValue/booleanvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/booleanValue/booleanvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.PrimitiveValue.booleanValue.booleanvalue001
* nsk.jdi.PrimitiveValue.booleanValue.booleanvalue001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.PrimitiveValue.booleanValue.booleanvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/byteValue/bytevalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/byteValue/bytevalue001.java
index 73214c27d13..a17346e3070 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/byteValue/bytevalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/byteValue/bytevalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -104,7 +104,9 @@ public class bytevalue001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/byteValue/bytevalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/byteValue/bytevalue001/TestDescription.java
index 7744c591880..593faef14de 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/byteValue/bytevalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/byteValue/bytevalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.PrimitiveValue.byteValue.bytevalue001
* nsk.jdi.PrimitiveValue.byteValue.bytevalue001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.PrimitiveValue.byteValue.bytevalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/charValue/charvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/charValue/charvalue001.java
index ee370916911..8fefafd6e32 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/charValue/charvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/charValue/charvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -104,7 +104,9 @@ public class charvalue001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/charValue/charvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/charValue/charvalue001/TestDescription.java
index 1e01641370e..c119da218f3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/charValue/charvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/charValue/charvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.PrimitiveValue.charValue.charvalue001
* nsk.jdi.PrimitiveValue.charValue.charvalue001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.PrimitiveValue.charValue.charvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue001.java
index ad1f0196195..dea4d530c36 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -104,7 +104,9 @@ public class doublevalue001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue001/TestDescription.java
index 1fd4d30de15..03be28a168e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.PrimitiveValue.doubleValue.doublevalue001
* nsk.jdi.PrimitiveValue.doubleValue.doublevalue001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.PrimitiveValue.doubleValue.doublevalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue002.java
index 4b5faa73119..587ea6cbd34 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -74,7 +74,9 @@ public class doublevalue002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue002/TestDescription.java
index d61234ad1c1..0b1d00852bb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.PrimitiveValue.doubleValue.doublevalue002
* nsk.jdi.PrimitiveValue.doubleValue.doublevalue002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.PrimitiveValue.doubleValue.doublevalue002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/floatValue/floatvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/floatValue/floatvalue001.java
index 4ea9dc7643c..5a0d93a3f03 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/floatValue/floatvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/floatValue/floatvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -104,7 +104,9 @@ public class floatvalue001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/floatValue/floatvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/floatValue/floatvalue001/TestDescription.java
index 472a3e81408..d4caee2c12f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/floatValue/floatvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/floatValue/floatvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.PrimitiveValue.floatValue.floatvalue001
* nsk.jdi.PrimitiveValue.floatValue.floatvalue001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.PrimitiveValue.floatValue.floatvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/intValue/intvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/intValue/intvalue001.java
index 80e7b22c35e..5caffc03f01 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/intValue/intvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/intValue/intvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -104,7 +104,9 @@ public class intvalue001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/intValue/intvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/intValue/intvalue001/TestDescription.java
index 73d33454775..8127fcb21ed 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/intValue/intvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/intValue/intvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.PrimitiveValue.intValue.intvalue001
* nsk.jdi.PrimitiveValue.intValue.intvalue001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.PrimitiveValue.intValue.intvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/longValue/longvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/longValue/longvalue001.java
index ab3490307ff..936c839ffff 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/longValue/longvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/longValue/longvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -104,7 +104,9 @@ public class longvalue001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/longValue/longvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/longValue/longvalue001/TestDescription.java
index 7b019494f37..a0b18ba4212 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/longValue/longvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/longValue/longvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.PrimitiveValue.longValue.longvalue001
* nsk.jdi.PrimitiveValue.longValue.longvalue001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.PrimitiveValue.longValue.longvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/shortValue/shortvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/shortValue/shortvalue001.java
index b179feedaee..e06ad37a6ae 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/shortValue/shortvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/shortValue/shortvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -104,7 +104,9 @@ public class shortvalue001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/shortValue/shortvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/shortValue/shortvalue001/TestDescription.java
index e902a609656..a7964c64393 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/shortValue/shortvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/shortValue/shortvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.PrimitiveValue.shortValue.shortvalue001
* nsk.jdi.PrimitiveValue.shortValue.shortvalue001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.PrimitiveValue.shortValue.shortvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds001.java
index 988f20d8b52..dfc8a95dca6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -96,7 +96,10 @@ public class bounds001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds001/TestDescription.java
index bec18d13c41..3aa45fa2e7a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,7 @@
* @clean nsk.jdi.ReferenceType._bounds_.bounds001a
* @compile -g:lines,source,vars ../bounds001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType._bounds_.bounds001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds002.java
index f8eeed59262..fe011c16f10 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -66,7 +66,10 @@ public class bounds002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds002/TestDescription.java
index 4cc11c826cd..30171ae5dfa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -44,7 +44,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType._bounds_.bounds002
* nsk.jdi.ReferenceType._bounds_.bounds002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType._bounds_.bounds002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields001.java
index f6bf66908a9..fb1b2f683ed 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -121,13 +121,13 @@ public class allfields001 extends Log {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields001/TestDescription.java
index 8cb5f3efb74..fe0c781b56f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -46,7 +46,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.allFields.allfields001
* nsk.jdi.ReferenceType.allFields.allfields001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allFields.allfields001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields002.java
index 5ff2b6b4928..ae8e7ca3d6c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -55,13 +55,13 @@ public class allfields002 extends Log {
static ArgumentHandler argsHandler;
private static Log logHandler;
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields002/TestDescription.java
index effe2614428..feb95cf9a76 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allFields.allfields002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields003.java
index 1b70ed4a82c..c97278309c3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -51,13 +51,13 @@ public class allfields003 extends Log {
private final static String checked_class = package_prefix + "allfields003b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields003/TestDescription.java
index c34ab5e8d41..25196c3ae9b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allFields.allfields003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields004.java
index 03634e108f6..96cb9d2924d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -51,13 +51,13 @@ public class allfields004 extends Log {
/** Debugee's classes for check **/
private final static String class_for_check = package_prefix + "allfields004aClassForCheck";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields004/TestDescription.java
index fabc1712f14..d21c2c2aa06 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -44,7 +44,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.allFields.allfields004
* nsk.jdi.ReferenceType.allFields.allfields004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allFields.allfields004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields005.java
index ea2957dfa70..5a3eaa52d26 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -97,7 +97,10 @@ public class allfields005 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields005/TestDescription.java
index 7af7003a3e1..9d493c51ed1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -43,7 +43,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.allFields.allfields005
* nsk.jdi.ReferenceType.allFields.allfields005t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allFields.allfields005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields006.java
index 294d4610ecc..dd02a155362 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -69,7 +69,10 @@ public class allfields006 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields006/TestDescription.java
index 8a28c6cab06..304f8b513dd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.allFields.allfields006
* nsk.jdi.ReferenceType.allFields.allfields006a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allFields.allfields006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations001.java
index 5664a332d8b..1350197da72 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -63,7 +63,9 @@ public class alllinelocations001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations001/TestDescription.java
index 4e7a609527c..ad9da70abb2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@
* @clean nsk.jdi.ReferenceType.allLineLocations.alllinelocations001a
* @compile -g:lines,source,vars ../alllinelocations001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allLineLocations.alllinelocations001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations002.java
index 8f4f2a6ee34..408ff9a2fa7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -100,7 +100,10 @@ public class alllinelocations002 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations002/TestDescription.java
index 607d5a18d42..b83c33c0847 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.allLineLocations.alllinelocations002
* nsk.jdi.ReferenceType.allLineLocations.alllinelocations002t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allLineLocations.alllinelocations002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java
index a05f6d1a8b5..5ab40801e47 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -56,7 +56,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.ReferenceType.allLineLocations_ss.allLineLocations_ss003.allLineLocations_ss003
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allLineLocations_ss.allLineLocations_ss003.allLineLocations_ss003
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -79,7 +79,10 @@ import nsk.share.jdi.sde.*;
public class allLineLocations_ss003 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss004/allLineLocations_ss004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss004/allLineLocations_ss004.java
index 0bbfa18b2c1..dca9ef04de7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss004/allLineLocations_ss004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss004/allLineLocations_ss004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -57,7 +57,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.ReferenceType.allLineLocations_ss.allLineLocations_ss004.allLineLocations_ss004
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allLineLocations_ss.allLineLocations_ss004.allLineLocations_ss004
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -80,7 +80,10 @@ import nsk.share.jdi.sde.*;
public class allLineLocations_ss004 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss001.java
index d5dc58b9432..4367f582d17 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -62,7 +62,9 @@ public class alllinelocations_ss001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss001/TestDescription.java
index 6afc431b3f7..22047ffad6e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -93,7 +93,7 @@
* @clean nsk.jdi.ReferenceType.allLineLocations_ss.alllinelocations_ss001a
* @compile -g:lines,source,vars ../alllinelocations_ss001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allLineLocations_ss.alllinelocations_ss001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss002.java
index e0d0402bdde..71c4c3bcc77 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -100,7 +100,10 @@ public class alllinelocations_ss002 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss002/TestDescription.java
index e41e2cdce51..074aa89c489 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.allLineLocations_ss.alllinelocations_ss002
* nsk.jdi.ReferenceType.allLineLocations_ss.alllinelocations_ss002t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allLineLocations_ss.alllinelocations_ss002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods001.java
index ca199b05866..0a15a520f3e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -176,13 +176,13 @@ public class allmethods001 extends Log {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods001/TestDescription.java
index 3bd265f50c9..b5b0ab74d9e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.allMethods.allmethods001
* nsk.jdi.ReferenceType.allMethods.allmethods001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allMethods.allmethods001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods002.java
index 27c6fc80138..7e0757957b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -58,13 +58,13 @@ public class allmethods002 extends Log {
private static Log logHandler;
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods002/TestDescription.java
index ecfec77fae6..f5478f4c0e3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allMethods.allmethods002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods003.java
index 7a9f4159396..38039d69767 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -51,13 +51,13 @@ public class allmethods003 extends Log {
private final static String checked_class = package_prefix + "allmethods003b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods003/TestDescription.java
index 1741f3b3ae4..149de042248 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allMethods.allmethods003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods004.java
index bd654bd8585..681bf7af8bb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -51,13 +51,13 @@ public class allmethods004 extends Log {
/** Debugee's classes for check **/
private final static String class_for_check = package_prefix + "allmethods004aInterfaceForCheck";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods004/TestDescription.java
index 712fa75d7b1..f6981d4a6e9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -43,7 +43,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.allMethods.allmethods004
* nsk.jdi.ReferenceType.allMethods.allmethods004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allMethods.allmethods004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods005.java
index 667cfb939e0..fc2a078591b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -96,7 +96,10 @@ public class allmethods005 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods005/TestDescription.java
index 6808fd1857f..a709fb7f3d5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -42,7 +42,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.allMethods.allmethods005
* nsk.jdi.ReferenceType.allMethods.allmethods005t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allMethods.allmethods005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods006.java
index 9d92b9f85fc..4c4a7a47726 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -76,7 +76,10 @@ public class allmethods006 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods006/TestDescription.java
index 2f1e42da5de..dc9b6063c0e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.allMethods.allmethods006
* nsk.jdi.ReferenceType.allMethods.allmethods006a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.allMethods.allmethods006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availableStrata002/availableStrata002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availableStrata002/availableStrata002.java
index 9323139f838..c8a3b40b3f6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availableStrata002/availableStrata002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availableStrata002/availableStrata002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -37,7 +37,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.ReferenceType.availableStrata.availableStrata002.availableStrata002
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.availableStrata.availableStrata002.availableStrata002
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -60,7 +60,10 @@ import nsk.share.jdi.sde.*;
public class availableStrata002 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availablestrata001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availablestrata001.java
index deffb640805..3a83da53cf8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availablestrata001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availablestrata001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,9 @@ public class availablestrata001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availablestrata001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availablestrata001/TestDescription.java
index 5a068e8a51c..07ed6901da8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availablestrata001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availablestrata001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.availableStrata.availablestrata001
* nsk.jdi.ReferenceType.availableStrata.availablestrata001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.availableStrata.availablestrata001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001.java
index 101e006b90c..644e60f4844 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,7 +69,9 @@ public class classloader001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001/TestDescription.java
index 31dce7f14ce..1d27da32d72 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass loadclass1
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.classLoader.classloader001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj001.java
index 2052b5aaa3d..1948b32cdc4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -77,13 +77,13 @@ public class classobj001 extends Log {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj001/TestDescription.java
index 6920d0abd71..7da86a96738 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -42,7 +42,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.classObject.classobj001
* nsk.jdi.ReferenceType.classObject.classobj001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.classObject.classobj001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj002.java
index 8154c448fbc..82322f250e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -50,13 +50,13 @@ public class classobj002 extends Log {
private final static String checked_class = package_prefix + "classobj002b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj002/TestDescription.java
index d1e9cce7285..a639fe76ad8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.classObject.classobj002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj003.java
index facbe38b780..9b5c3d6ae58 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -64,7 +64,10 @@ public class classobj003 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj003/TestDescription.java
index f8221c7c480..ed6a3aa889d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.classObject.classobj003
* nsk.jdi.ReferenceType.classObject.classobj003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.classObject.classobj003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum002/defaultStratum002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum002/defaultStratum002.java
index b7dd63c13da..0b28e624734 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum002/defaultStratum002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum002/defaultStratum002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -64,7 +64,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.ReferenceType.defaultStratum.defaultStratum002.defaultStratum002
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.defaultStratum.defaultStratum002.defaultStratum002
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -88,7 +88,10 @@ import nsk.share.jdi.sde.*;
public class defaultStratum002 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum003/defaultStratum003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum003/defaultStratum003.java
index b8fcd1d9262..695d813f3b0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum003/defaultStratum003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum003/defaultStratum003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -54,7 +54,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.ReferenceType.defaultStratum.defaultStratum003.defaultStratum003
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.defaultStratum.defaultStratum003.defaultStratum003
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -79,7 +79,10 @@ import nsk.share.jdi.sde.*;
public class defaultStratum003 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum004/defaultStratum004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum004/defaultStratum004.java
index 62119febda2..bd301a1c018 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum004/defaultStratum004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum004/defaultStratum004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.defaultStratum.defaultStratum004.defaultStratum004
* nsk.jdi.ReferenceType.defaultStratum.defaultStratum004.defaultStratum004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.defaultStratum.defaultStratum004.defaultStratum004
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -69,7 +69,10 @@ import nsk.share.jdi.sde.*;
public class defaultStratum004 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultstratum001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultstratum001.java
index 0fc565751fb..a1da6915faa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultstratum001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultstratum001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -64,7 +64,9 @@ public class defaultstratum001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultstratum001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultstratum001/TestDescription.java
index fb365b73931..2715f6e5cd8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultstratum001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultstratum001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.defaultStratum.defaultstratum001
* nsk.jdi.ReferenceType.defaultStratum.defaultstratum001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.defaultStratum.defaultstratum001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals001.java
index d5358b13861..4d561c87d1b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -78,13 +78,13 @@ public class equals001 {
{debugeeName+"$s_interf", reference_type_sign}
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals001/TestDescription.java
index 8460796f70c..1b1aff020cb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.equals.equals001
* nsk.jdi.ReferenceType.equals.equals001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.equals.equals001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals002.java
index 1e210565466..bcfcac4f8d0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -52,13 +52,13 @@ public class equals002 {
private final static String checked_class = package_prefix + "equals002b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals002/TestDescription.java
index c6a81e53852..1ccd1358c1c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.equals.equals002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedToInitialize001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedToInitialize001.java
index e35a80b9db3..096d1c24ca5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedToInitialize001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedToInitialize001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -64,13 +64,13 @@ public class failedToInitialize001 extends Log {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedToInitialize001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedToInitialize001/TestDescription.java
index 7bbdae7e654..a1d0665a88b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedToInitialize001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedToInitialize001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -41,7 +41,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.failedToInitialize.failedToInitialize001
* nsk.jdi.ReferenceType.failedToInitialize.failedToInitialize001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.failedToInitialize.failedToInitialize001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedtoinit002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedtoinit002.java
index 0d0726e5686..515e7f0140e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedtoinit002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedtoinit002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -51,13 +51,13 @@ public class failedtoinit002 {
private final static String checked_class = package_prefix + "failedtoinit002b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedtoinit002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedtoinit002/TestDescription.java
index c9e71b9e30b..af68db9d869 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedtoinit002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedtoinit002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.failedToInitialize.failedtoinit002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname001.java
index b037ae45de0..1bfb90ff309 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -114,13 +114,13 @@ public class fieldbyname001 extends Log {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname001/TestDescription.java
index 1de7995bc36..a3fdea994f1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.fieldByName.fieldbyname001
* nsk.jdi.ReferenceType.fieldByName.fieldbyname001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.fieldByName.fieldbyname001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname002.java
index bcbb8846e72..32eea48a50f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -58,13 +58,13 @@ public class fieldbyname002 extends Log {
private static Log logHandler;
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname002/TestDescription.java
index a47d190a44b..f945b8d74de 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.fieldByName.fieldbyname002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname003.java
index 184cf3e865c..a8c7f6f35fc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -52,13 +52,13 @@ public class fieldbyname003 extends Log {
private final static String checked_class = package_prefix + "fieldbyname003b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname003/TestDescription.java
index 70438630989..bbd8998d3a1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.fieldByName.fieldbyname003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields001.java
index 3b2fb2c6e3f..0e6bd85a148 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -86,13 +86,13 @@ public class fields001 {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields001/TestDescription.java
index bc3a3a289c6..45a46baa6f8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -46,7 +46,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.fields.fields001
* nsk.jdi.ReferenceType.fields.fields001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.fields.fields001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields002.java
index 63eb6e6ea15..3c55e803635 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -55,13 +55,13 @@ public class fields002 {
private final static String classLoaderName = package_prefix + "fields002aClassLoader";
private final static String classFieldName = "loadedClass";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields002/TestDescription.java
index eef169b8814..5bd713a1364 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.fields.fields002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields003.java
index 48807fdda96..03e9399f47e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -51,13 +51,13 @@ public class fields003 {
private final static String checked_class = package_prefix + "fields003b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields003/TestDescription.java
index 7c2e910e27c..d6379dfbdbf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.fields.fields003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields004.java
index f796027328d..bcfa4e323c1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -52,13 +52,12 @@ public class fields004 {
/** Debugee's classes for check **/
private final static String class_for_check = package_prefix + "fields004aClassForCheck";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result); }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields004/TestDescription.java
index fcbc27c5cb5..7eb5fbd7e38 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -46,7 +46,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.fields.fields004
* nsk.jdi.ReferenceType.fields.fields004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.fields.fields004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields005.java
index 625e7ade016..70620cb2cf3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -97,7 +97,10 @@ public class fields005 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields005/TestDescription.java
index bd32ca4fa27..fdabb81670c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -43,7 +43,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.fields.fields005
* nsk.jdi.ReferenceType.fields.fields005t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.fields.fields005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields006.java
index d0fd42e6bce..e69c3e5b442 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -65,7 +65,10 @@ public class fields006 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields006/TestDescription.java
index 6eb28615609..4cd4b5c049e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.fields.fields006
* nsk.jdi.ReferenceType.fields.fields006a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.fields.fields006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001.java
index ceb9b6286c4..92b85582c68 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -124,13 +124,12 @@ public class genericSignature001 {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int result = run(argv, System.out);
- System.exit(result + STATUS_TEMP);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001/TestDescription.java
index afea224611a..516db6b7dd8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -49,7 +49,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.genericSignature.genericSignature001
* nsk.jdi.ReferenceType.genericSignature.genericSignature001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.genericSignature.genericSignature001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002.java
index 86262573aae..07d8da57c92 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -106,13 +106,12 @@ public class genericSignature002 {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int result = run(argv, System.out);
- System.exit(result + STATUS_TEMP);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002/TestDescription.java
index 0e90d493c72..b06edf76b9f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.genericSignature.genericSignature002
* nsk.jdi.ReferenceType.genericSignature.genericSignature002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.genericSignature.genericSignature002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001.java
index e2e80abfbd0..bcd64b0b460 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,7 +69,9 @@ public class getvalue001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001/TestDescription.java
index fa6a5d4c1c3..9ef85b98057 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.getValue.getvalue001
* nsk.jdi.ReferenceType.getValue.getvalue001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.getValue.getvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002.java
index d3a2cbab4b2..5d7439b2f8c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -68,7 +68,9 @@ public class getvalue002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002/TestDescription.java
index 451c06bc22c..7ac984bf44d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.getValue.getvalue002
* nsk.jdi.ReferenceType.getValue.getvalue002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.getValue.getvalue002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003.java
index 7e1795fc76e..b81bfd78729 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -68,7 +68,9 @@ public class getvalue003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003/TestDescription.java
index e9be14bf4b8..e83f1df0f8a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.getValue.getvalue003
* nsk.jdi.ReferenceType.getValue.getvalue003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.getValue.getvalue003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue004.java
index e02927bdee2..5c6f6d0ab5f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -97,7 +97,10 @@ public class getvalue004 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue004/TestDescription.java
index b03d1cbb4a2..cec8f355e00 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.getValue.getvalue004
* nsk.jdi.ReferenceType.getValue.getvalue004t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.getValue.getvalue004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue005.java
index 08495fe4304..83c0105e1fe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -107,7 +107,10 @@ public class getvalue005 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue005/TestDescription.java
index aa083f01101..374ba8a646d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -43,7 +43,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.getValue.getvalue005
* nsk.jdi.ReferenceType.getValue.getvalue005t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.getValue.getvalue005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001.java
index 8403ab05547..b14d687b411 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -72,7 +72,9 @@ public class getvalues001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001/TestDescription.java
index 8f200f400e6..f67d62f459b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.getValues.getvalues001
* nsk.jdi.ReferenceType.getValues.getvalues001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.getValues.getvalues001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues002.java
index d0370d4ca34..338c9c01472 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -100,7 +100,10 @@ public class getvalues002 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues002/TestDescription.java
index b879a131e7e..20e6642b5e0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -49,7 +49,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.getValues.getvalues002
* nsk.jdi.ReferenceType.getValues.getvalues002t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.getValues.getvalues002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues003.java
index c93be1803a5..da47da7b5cb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -110,7 +110,10 @@ public class getvalues003 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues003/TestDescription.java
index 316aeaca9fe..513119164b7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -50,7 +50,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.getValues.getvalues003
* nsk.jdi.ReferenceType.getValues.getvalues003t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.getValues.getvalues003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode001.java
index 558d081fafc..57f08ebe7f0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -78,13 +78,13 @@ public class hashcode001 {
{debugeeName+"$s_interf", reference_type_sign}
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode001/TestDescription.java
index adfe00afe15..51a6f77a27d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.hashCode.hashcode001
* nsk.jdi.ReferenceType.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode002.java
index d1c4b24a5ca..b3df1016476 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -52,13 +52,13 @@ public class hashcode002 {
private final static String checked_class = package_prefix + "hashcode002b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode002/TestDescription.java
index f9b7face6eb..f7a960746d9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.hashCode.hashcode002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances001/instances001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances001/instances001.java
index c0697cd5280..eb979db15e0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances001/instances001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances001/instances001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -83,7 +83,10 @@ import nsk.share.jpda.AbstractDebuggeeTest;
public class instances001 extends HeapwalkingDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances002/instances002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances002/instances002.java
index 7fb1ee83914..53b6fc1ec6c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances002/instances002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances002/instances002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -66,7 +66,10 @@ import nsk.share.jpda.AbstractDebuggeeTest;
public class instances002 extends HeapwalkingDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances003/instances003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances003/instances003.java
index 966124f77e3..3e242dc5e9e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances003/instances003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances003/instances003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -101,7 +101,10 @@ public class instances003 extends HeapwalkingDebugger {
}
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances005/instances005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances005/instances005.java
index 7ef73e76cbc..308d767e2d3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances005/instances005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances005/instances005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -65,7 +65,10 @@ import nsk.share.jdi.TestClass1;
public class instances005 extends HeapwalkingDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private int instanceCount = 100000;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isAbstract001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isAbstract001.java
index 1be2afea3da..d7638379138 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isAbstract001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isAbstract001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -64,13 +64,13 @@ public class isAbstract001 extends Log {
{package_prefix + "abstr_interf", "abstract", "interface"}
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isAbstract001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isAbstract001/TestDescription.java
index 0e80c3f4467..2bd3e7615d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isAbstract001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isAbstract001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -41,7 +41,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.isAbstract.isAbstract001
* nsk.jdi.ReferenceType.isAbstract.isAbstract001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.isAbstract.isAbstract001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract002.java
index 5bec6ff24fd..5d504d878e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -51,13 +51,13 @@ public class isabstract002 {
private final static String checked_class = package_prefix + "isabstract002b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract002/TestDescription.java
index 5f8ebd3e32a..6f9c0d5b18e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.isAbstract.isabstract002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract003.java
index 43496804edb..1470e82f10a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -64,7 +64,10 @@ public class isabstract003 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract003/TestDescription.java
index b415510d356..5377dd8f0a3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.isAbstract.isabstract003
* nsk.jdi.ReferenceType.isAbstract.isabstract003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.isAbstract.isabstract003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001.java
index 34fac9f878e..885e1ec17a4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -54,7 +54,9 @@ public class isfinal001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001/TestDescription.java
index 1e598dcb685..0d9dd1cedb8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.isFinal.isfinal001
* nsk.jdi.ReferenceType.isFinal.isfinal001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.isFinal.isfinal001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal002.java
index d0c76736d69..2d01b4152d2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -64,7 +64,10 @@ public class isfinal002 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal002/TestDescription.java
index f3e8c769cc4..f17bc4b15de 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.isFinal.isfinal002
* nsk.jdi.ReferenceType.isFinal.isfinal002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.isFinal.isfinal002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit001.java
index 6efaa399b89..5674f53f521 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -64,13 +64,13 @@ public class isinit001 {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit001/TestDescription.java
index 8143e0f04f4..b19a10c05b0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.isInitialized.isinit001
* nsk.jdi.ReferenceType.isInitialized.isinit001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.isInitialized.isinit001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit002.java
index 658ed8ad4ba..1675eb444c0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -51,13 +51,13 @@ public class isinit002 {
private final static String checked_class = package_prefix + "isinit002b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit002/TestDescription.java
index 4b4da282354..c484851c178 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.isInitialized.isinit002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit003.java
index 0f6d0716e1d..8c1064039f0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -64,7 +64,10 @@ public class isinit003 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit003/TestDescription.java
index 71a10268e97..c6ceec0f2bb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.isInitialized.isinit003
* nsk.jdi.ReferenceType.isInitialized.isinit003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.isInitialized.isinit003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared001.java
index 1f79a950faa..2eff33ed6c9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -63,13 +63,13 @@ public class isprepared001 {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared001/TestDescription.java
index 1e3d5ed134b..343b9b1ae24 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.isPrepared.isprepared001
* nsk.jdi.ReferenceType.isPrepared.isprepared001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.isPrepared.isprepared001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared002.java
index d160d257434..e3680b64ab9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -52,13 +52,13 @@ public class isprepared002 {
private final static String checked_class = package_prefix + "isprepared002b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared002/TestDescription.java
index 3a68fff885c..867b7c45e81 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.isPrepared.isprepared002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001.java
index f73be251211..e6e901f31e5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class isstatic001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001/TestDescription.java
index 215dcc1d805..29dc671e51b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.isStatic.isstatic001
* nsk.jdi.ReferenceType.isStatic.isstatic001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.isStatic.isstatic001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002.java
index 0749021269e..d07705fe4c6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class isstatic002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002/TestDescription.java
index 41b0bd34b4c..9811186a16c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.isStatic.isstatic002
* nsk.jdi.ReferenceType.isStatic.isstatic002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.isStatic.isstatic002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isVerified001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isVerified001.java
index 6f920e5417b..f0bb211b7da 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isVerified001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isVerified001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -70,13 +70,13 @@ public class isVerified001 extends Log {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isVerified001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isVerified001/TestDescription.java
index fa5dcfa14c1..9b2dce7f47d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isVerified001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isVerified001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.isVerified.isVerified001
* nsk.jdi.ReferenceType.isVerified.isVerified001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.isVerified.isVerified001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified002.java
index b5fe3449d68..237f8e8f780 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -53,13 +53,13 @@ public class isverified002 {
private final static String checked_class = package_prefix + "isverified002b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified002/TestDescription.java
index bf11eaeba07..5f638386da8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.isVerified.isverified002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified003.java
index 47e594e51b7..c7c2b107d5d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -66,7 +66,10 @@ public class isverified003 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified003/TestDescription.java
index ae0906a7807..6b8c8a07b3b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.isVerified.isverified003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i001.java
index bbec3a46158..285e864e605 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -65,7 +65,9 @@ public class locationsofline_i001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i001/TestDescription.java
index 083d5c85009..c5dcfbd58dd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -81,7 +81,7 @@
* @clean nsk.jdi.ReferenceType.locationsOfLine_i.locationsofline_i001a
* @compile -g:lines,source,vars ../locationsofline_i001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.locationsOfLine_i.locationsofline_i001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i002.java
index b08d372dc1d..63681a918f5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -100,7 +100,10 @@ public class locationsofline_i002 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i002/TestDescription.java
index 105ef7ac9bd..9e96a0ec221 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.locationsOfLine_i.locationsofline_i002
* nsk.jdi.ReferenceType.locationsOfLine_i.locationsofline_i002t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.locationsOfLine_i.locationsofline_i002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java
index edf086c38b3..8f92ed22a2d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -57,7 +57,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.ReferenceType.locationsOfLine_ssi.locationsOfLine_ssi003.locationsOfLine_ssi003
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.locationsOfLine_ssi.locationsOfLine_ssi003.locationsOfLine_ssi003
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -79,7 +79,10 @@ import nsk.share.jdi.sde.*;
public class locationsOfLine_ssi003 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi004/locationsOfLine_ssi004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi004/locationsOfLine_ssi004.java
index 334c18f3447..31aa9ab3b42 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi004/locationsOfLine_ssi004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi004/locationsOfLine_ssi004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -57,7 +57,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.ReferenceType.locationsOfLine_ssi.locationsOfLine_ssi004.locationsOfLine_ssi004
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.locationsOfLine_ssi.locationsOfLine_ssi004.locationsOfLine_ssi004
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -80,7 +80,10 @@ import nsk.share.jdi.sde.*;
public class locationsOfLine_ssi004 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi001.java
index 9816e45900c..b7ecd899bb8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class locationsofline_ssi001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java
index 9d89dedfa66..756454db259 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -88,7 +88,7 @@
* @clean nsk.jdi.ReferenceType.locationsOfLine_ssi.locationsofline_ssi001a
* @compile -g:lines,source,vars ../locationsofline_ssi001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.locationsOfLine_ssi.locationsofline_ssi001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi002.java
index 1c5f253c6be..581ce3fd658 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -100,7 +100,10 @@ public class locationsofline_ssi002 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi002/TestDescription.java
index 18d4666a9fe..c87803df4cd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.locationsOfLine_ssi.locationsofline_ssi002
* nsk.jdi.ReferenceType.locationsOfLine_ssi.locationsofline_ssi002t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.locationsOfLine_ssi.locationsofline_ssi002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods001.java
index 7feeb4c0c32..b004aeb59c9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -142,13 +142,13 @@ public class methods001 {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods001/TestDescription.java
index bcc7d80a840..84fa7f43294 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.methods.methods001
* nsk.jdi.ReferenceType.methods.methods001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.methods.methods001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods002.java
index b8bf39e1842..b54e423eb70 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -55,13 +55,13 @@ public class methods002 {
private final static String classLoaderName = package_prefix + "methods002aClassLoader";
private final static String classFieldName = "loadedClass";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods002/TestDescription.java
index ae6d3385a0e..b8957fb1c0e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.methods.methods002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods003.java
index e878fae9e39..7b37f8718d9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -52,13 +52,13 @@ public class methods003 {
private final static String checked_class = package_prefix + "methods003b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods003/TestDescription.java
index 5335f743ed0..df70528ffd9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.methods.methods003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods004.java
index 952c5e1515a..fd86fd11b6c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -52,13 +52,13 @@ public class methods004 {
/** Debugee's classes for check **/
private final static String class_for_check = package_prefix + "methods004aInterfaceForCheck";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods004/TestDescription.java
index 511367d9754..25778f2f00c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -44,7 +44,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.methods.methods004
* nsk.jdi.ReferenceType.methods.methods004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.methods.methods004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods005.java
index 9e048f477f8..cde19b20f04 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -96,7 +96,10 @@ public class methods005 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods005/TestDescription.java
index 83e7e2c28b1..ab805ab9315 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -42,7 +42,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.methods.methods005
* nsk.jdi.ReferenceType.methods.methods005t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.methods.methods005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods006.java
index fa169395d98..b1c6266a135 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -69,7 +69,10 @@ public class methods006 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods006/TestDescription.java
index 5f19cdbb31e..2c58d6350a8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.methods.methods006
* nsk.jdi.ReferenceType.methods.methods006a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.methods.methods006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s001.java
index 1b17c1e1919..b059903782d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -156,13 +156,13 @@ public class methbyname_s001 extends Log {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s001/TestDescription.java
index 300e24cafc9..11dd886ea20 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -44,7 +44,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.methodsByName_s.methbyname_s001
* nsk.jdi.ReferenceType.methodsByName_s.methbyname_s001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.methodsByName_s.methbyname_s001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s002.java
index 6a2951c8e4e..e09a6e384ad 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -58,13 +58,13 @@ public class methbyname_s002 extends Log {
private static Log logHandler;
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s002/TestDescription.java
index 259bd8227ee..bdfe397adf3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.methodsByName_s.methbyname_s002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s003.java
index 92aca680933..ef3885f6e5f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -51,13 +51,13 @@ public class methbyname_s003 extends Log {
private final static String checked_class = package_prefix + "methbyname_s003b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s003/TestDescription.java
index 7ef771f2ac1..fae4c67e986 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.methodsByName_s.methbyname_s003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s004.java
index aeacb65598f..47bb9b350f3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -82,13 +82,13 @@ public class methbyname_s004 extends Log {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s004/TestDescription.java
index 70c8fa81568..c0e9a10a098 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -44,7 +44,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.methodsByName_s.methbyname_s004
* nsk.jdi.ReferenceType.methodsByName_s.methbyname_s004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.methodsByName_s.methbyname_s004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss001.java
index e316d96ea4f..08da95dd7fd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -169,13 +169,13 @@ public class methbyname_ss001 extends Log {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss001/TestDescription.java
index 2df3fa3f0a6..de09aec27ff 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -44,7 +44,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.methodsByName_ss.methbyname_ss001
* nsk.jdi.ReferenceType.methodsByName_ss.methbyname_ss001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.methodsByName_ss.methbyname_ss001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss002.java
index d66e8f35e64..e3090542cdd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -58,13 +58,13 @@ public class methbyname_ss002 extends Log {
private static Log logHandler;
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss002/TestDescription.java
index da73cbe13f1..0113bf81f93 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.methodsByName_ss.methbyname_ss002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss003.java
index d8c87906b36..413d410037f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -53,13 +53,13 @@ public class methbyname_ss003 {
private final static String checked_class = package_prefix + "methbyname_ss003b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss003/TestDescription.java
index a1df9eb5efb..5d21a5c868f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.methodsByName_ss.methbyname_ss003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name001.java
index 1b5d3c7e39d..bfd68bcae4f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -78,13 +78,13 @@ public class name001 {
{debugeeName+"$s_interf", reference_type_sign}
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name001/TestDescription.java
index 90e6ebfdcce..77b7eb38ad8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -46,7 +46,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.name.name001
* nsk.jdi.ReferenceType.name.name001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.name.name001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name002.java
index 8f69320a06d..d9af04da19b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -52,13 +52,13 @@ public class name002 {
private final static String checked_class = package_prefix + "name002b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name002/TestDescription.java
index 85b13a681d8..91c37d75710 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.name.name002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001.java
index 3a5b90df78e..69d2a8ed24b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -68,7 +68,9 @@ public class nestedtypes001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001/TestDescription.java
index 96db9523448..5bffeded63c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.nestedTypes.nestedtypes001
* nsk.jdi.ReferenceType.nestedTypes.nestedtypes001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.nestedTypes.nestedtypes001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002.java
index 5a64f4cf03e..344e1fd199a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -68,7 +68,9 @@ public class nestedtypes002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002/TestDescription.java
index d3ae406b39e..4ee02b41701 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -75,7 +75,7 @@
* @clean nsk.jdi.ReferenceType.nestedTypes.nestedtypes002a
* @compile -g:lines,source,vars ../nestedtypes002a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.nestedTypes.nestedtypes002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx001.java
index 3db76e18d38..2069418b186 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -51,7 +51,10 @@ public class srcdebugx001 {
private Debugee debuggee;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx001/TestDescription.java
index 0c741875823..91b9655d73a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* @clean nsk.jdi.ReferenceType.sourceDebugExtension.srcdebugx001t
* @compile -g:lines,source,vars ../srcdebugx001t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.sourceDebugExtension.srcdebugx001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx002.java
index 710f530d97d..8159fc1ea3f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -55,7 +55,10 @@ public class srcdebugx002 {
private Debugee debuggee;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx002/TestDescription.java
index 1d98492cd9d..4bb17e73536 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,7 @@
* nsk.jdi.ReferenceType.sourceDebugExtension.srcdebugx002t
* @compile srcdebugx002x.jcod
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.sourceDebugExtension.srcdebugx002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename001.java
index cf2f6a74260..7840670aa43 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -65,13 +65,13 @@ public class sourcename001 {
{debugeeName+"$s_interf", debugee_source_name}
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename001/TestDescription.java
index 50ae7e13b82..23b6da5bd0a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -46,7 +46,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.sourceName.sourcename001
* nsk.jdi.ReferenceType.sourceName.sourcename001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.sourceName.sourcename001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename002.java
index ff5f2a9caf8..df523a5a559 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -52,13 +52,13 @@ public class sourcename002 {
private final static String checked_class = package_prefix + "sourcename002b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename002/TestDescription.java
index 30cb4f6655a..74427e9a8bc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.sourceName.sourcename002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename003.java
index ac91b7dc2de..c4163f123b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -53,13 +53,13 @@ public class sourcename003 {
private final static String checked_class = thisClassName + "[]";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename003/TestDescription.java
index 00b29acac06..ab5624f9332 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -44,7 +44,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.sourceName.sourcename003
* nsk.jdi.ReferenceType.sourceName.sourcename003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.sourceName.sourcename003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004.java
index ff54267302b..b6f24e04ecc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -107,7 +107,10 @@ public class sourcename004 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004/TestDescription.java
index 2e8e60e59d3..48b600fbda2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.sourceName.sourcename004
* nsk.jdi.ReferenceType.sourceName.sourcename004t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.sourceName.sourcename004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourceNames003/sourceNames003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourceNames003/sourceNames003.java
index 337b08b98f4..486004d324c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourceNames003/sourceNames003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourceNames003/sourceNames003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -37,7 +37,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.ReferenceType.sourceNames.sourceNames003.sourceNames003
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.sourceNames.sourceNames003.sourceNames003
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -60,7 +60,10 @@ import nsk.share.jdi.sde.*;
public class sourceNames003 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames001.java
index 0163b4fed15..7327ef738a9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -68,7 +68,9 @@ public class sourcenames001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames001/TestDescription.java
index 6fac396845a..3bbdb18c452 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -78,7 +78,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.sourceNames.sourcenames001
* nsk.jdi.ReferenceType.sourceNames.sourcenames001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.sourceNames.sourcenames001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002.java
index 5008d08c8e4..d6063179779 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -107,7 +107,10 @@ public class sourcenames002 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002/TestDescription.java
index 989b6e46c5d..9afac12e10e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.sourceNames.sourcenames002
* nsk.jdi.ReferenceType.sourceNames.sourcenames002t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.sourceNames.sourcenames002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcePaths003/sourcePaths003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcePaths003/sourcePaths003.java
index e48a6cbe12d..d34787b17e9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcePaths003/sourcePaths003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcePaths003/sourcePaths003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -37,7 +37,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.ReferenceType.sourcePaths.sourcePaths003.sourcePaths003
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.sourcePaths.sourcePaths003.sourcePaths003
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -60,7 +60,10 @@ import nsk.share.jdi.sde.*;
public class sourcePaths003 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths001.java
index b7b2b5922b9..37ae91bed74 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,7 +69,9 @@ public class sourcepaths001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths001/TestDescription.java
index c398f0ddbb2..82e5f014548 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -79,7 +79,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.sourcePaths.sourcepaths001
* nsk.jdi.ReferenceType.sourcePaths.sourcepaths001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.sourcePaths.sourcepaths001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths002.java
index 511a1f5397f..d8f3fa81c1c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -99,7 +99,10 @@ public class sourcepaths002 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths002/TestDescription.java
index c1d3b9374b9..d2661763e4a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.sourcePaths.sourcepaths002
* nsk.jdi.ReferenceType.sourcePaths.sourcepaths002t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.sourcePaths.sourcepaths002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield001.java
index 3ad83704548..cf6f4ae420f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -108,13 +108,13 @@ public class visibfield001 extends Log {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield001/TestDescription.java
index b0fbc755a86..6e1e570c6c5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -46,7 +46,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.visibleFields.visibfield001
* nsk.jdi.ReferenceType.visibleFields.visibfield001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.visibleFields.visibfield001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield002.java
index d001e50c141..a9cb1fb4f41 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -58,13 +58,13 @@ public class visibfield002 extends Log {
private static Log logHandler;
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield002/TestDescription.java
index 735a41d46f1..fb417aa7a1d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.visibleFields.visibfield002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield003.java
index 8c452d84e89..14520271c17 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -51,13 +51,13 @@ public class visibfield003 extends Log {
private final static String checked_class = package_prefix + "visibfield003b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield003/TestDescription.java
index de8bd4c1de1..db4ba02e457 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.visibleFields.visibfield003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield004.java
index 7c9b4e7c34d..5eee5228479 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -51,13 +51,13 @@ public class visibfield004 extends Log {
/** Debugee's classes for check **/
private final static String class_for_check = package_prefix + "visibfield004aClassForCheck";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield004/TestDescription.java
index 1491c24320f..5f3584cbd91 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.visibleFields.visibfield004
* nsk.jdi.ReferenceType.visibleFields.visibfield004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.visibleFields.visibfield004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield005.java
index f13995bd242..a6e73aa9b0a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -97,7 +97,10 @@ public class visibfield005 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield005/TestDescription.java
index c832965cb5c..11b7bb4dfec 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -43,7 +43,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.visibleFields.visibfield005
* nsk.jdi.ReferenceType.visibleFields.visibfield005t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.visibleFields.visibfield005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield006.java
index 05390749ca2..26510ec043f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -65,7 +65,10 @@ public class visibfield006 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield006/TestDescription.java
index dea14c0fff8..43d89d0a6cc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.visibleFields.visibfield006
* nsk.jdi.ReferenceType.visibleFields.visibfield006a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.visibleFields.visibfield006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod001.java
index e4912181f04..d3bcc84c7e2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -154,13 +154,13 @@ public class visibmethod001 extends Log {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod001/TestDescription.java
index f56a307cbb3..08379613165 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.visibleMethods.visibmethod001
* nsk.jdi.ReferenceType.visibleMethods.visibmethod001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.visibleMethods.visibmethod001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod002.java
index 4bddea133c3..5f3f9e1d6e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -58,13 +58,13 @@ public class visibmethod002 extends Log {
private static Log logHandler;
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod002/TestDescription.java
index a0919145b72..72978fd9bc3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.visibleMethods.visibmethod002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod003.java
index 70e68d57e34..94f8616e627 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -51,13 +51,13 @@ public class visibmethod003 extends Log {
private final static String checked_class = package_prefix + "visibmethod003b";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod003/TestDescription.java
index c20da1b687f..11c4c3566bb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @run driver nsk.share.ExtraClassesBuilder
* loadclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.visibleMethods.visibmethod003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod004.java
index 63a859c6c61..ba1449d960e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -51,13 +51,13 @@ public class visibmethod004 extends Log {
/** Debugee's classes for check **/
private final static String class_for_check = package_prefix + "visibmethod004aInterfaceForCheck";
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod004/TestDescription.java
index 1c8984f9b3c..ebbcfcaeff4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -43,7 +43,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.visibleMethods.visibmethod004
* nsk.jdi.ReferenceType.visibleMethods.visibmethod004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.visibleMethods.visibmethod004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod005.java
index ab11e7300d5..0c752e720c3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -63,13 +63,13 @@ public class visibmethod005 extends Log {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int exitCode = run(argv,System.out);
- System.exit(exitCode + 95/*STATUS_TEMP*/);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
+
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod005/TestDescription.java
index 6e050b3c811..5d8711f225d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.visibleMethods.visibmethod005
* nsk.jdi.ReferenceType.visibleMethods.visibmethod005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.visibleMethods.visibmethod005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod006.java
index 9c1e9280622..16b819f8481 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -97,7 +97,10 @@ public class visibmethod006 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod006/TestDescription.java
index 15ad5bb76c9..f46bd6da39c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -43,7 +43,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.visibleMethods.visibmethod006
* nsk.jdi.ReferenceType.visibleMethods.visibmethod006t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.visibleMethods.visibmethod006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod007.java
index 5c5971f2baf..f337b1b72a7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod007.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -76,7 +76,10 @@ public class visibmethod007 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod007/TestDescription.java
index 6ad5958f6e3..eaf24c54c6c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod007/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.ReferenceType.visibleMethods.visibmethod007
* nsk.jdi.ReferenceType.visibleMethods.visibmethod007a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ReferenceType.visibleMethods.visibmethod007
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001.java
index 401fe637154..022f8ceff9b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -84,7 +84,10 @@ public class popframes001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001/TestDescription.java
index acebfc822c6..d9d57a595e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* /test/lib
* @build nsk.jdi.Scenarios.invokeMethod.popframes001
* nsk.jdi.Scenarios.invokeMethod.popframes001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Scenarios.invokeMethod.popframes001
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/redefineclasses001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/redefineclasses001.java
index 61174bbf09a..ba359ebb20f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/redefineclasses001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/redefineclasses001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -74,7 +74,10 @@ public class redefineclasses001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/redefineclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/redefineclasses001/TestDescription.java
index f35e68108cc..e84409a3ee9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/redefineclasses001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/redefineclasses001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Scenarios.invokeMethod.redefineclasses001
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/choices/choices001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/choices/choices001.java
index 2194062a6bc..70e40690e3b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/choices/choices001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/choices/choices001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -59,7 +59,10 @@ import com.sun.jdi.connect.Connector.SelectedArgument;
public class choices001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/choices/choices001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/choices/choices001/TestDescription.java
index 079afd39a64..cf96e29b416 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/choices/choices001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/choices/choices001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.SelectedArgument.choices.choices001
- * @run main/othervm
+ * @run driver
* nsk.jdi.SelectedArgument.choices.choices001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid001.java
index 6ae87b3e198..990e83ec853 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -57,7 +57,10 @@ import com.sun.jdi.connect.Connector;
public class isvalid001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid001/TestDescription.java
index 0b3ffeed949..1ae050dc38f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -54,7 +54,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.SelectedArgument.isValid.isvalid001
- * @run main/othervm
+ * @run driver
* nsk.jdi.SelectedArgument.isValid.isvalid001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid002.java
index bf564e1de0e..579d2c477fd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -60,7 +60,10 @@ import com.sun.jdi.connect.Connector.SelectedArgument;
public class isvalid002 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid002/TestDescription.java
index 691178ad972..e730dfbbe4e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.SelectedArgument.isValid.isvalid002
- * @run main/othervm
+ * @run driver
* nsk.jdi.SelectedArgument.isValid.isvalid002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001.java
index 141b6181789..fea3e5c78b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class shorttype001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001/TestDescription.java
index f74f7e1ba04..2adffa92a00 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.ShortType._itself_.shorttype001
* nsk.jdi.ShortType._itself_.shorttype001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ShortType._itself_.shorttype001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/compareTo/compareto001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/compareTo/compareto001.java
index 483897bcc9c..94590d74c3a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/compareTo/compareto001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/compareTo/compareto001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -64,7 +64,10 @@ public class compareto001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/compareTo/compareto001/TestDescription.java
index 2cabe0ae063..c302135e7c2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/compareTo/compareto001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/compareTo/compareto001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.ShortValue.compareTo.compareto001
* nsk.jdi.ShortValue.compareTo.compareto001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ShortValue.compareTo.compareto001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals001.java
index 92150b242dd..6d042e36307 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -79,7 +79,9 @@ public class equals001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals001/TestDescription.java
index 5d26191606a..b608ba6d728 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.ShortValue.equals.equals001
* nsk.jdi.ShortValue.equals.equals001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ShortValue.equals.equals001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals002.java
index ef66f7395b0..1cc74ee70c6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -60,7 +60,10 @@ public class equals002 {
private static ReferenceType refType;
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals002/TestDescription.java
index 4f5146dc591..5846729a846 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.ShortValue.equals.equals002
* nsk.jdi.ShortValue.equals.equals002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ShortValue.equals.equals002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/hashCode/hashcode001.java
index 61819af6665..4b6ba85e577 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -74,7 +74,9 @@ public class hashcode001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/hashCode/hashcode001/TestDescription.java
index 88b42431c4e..a2adada61e9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.ShortValue.hashCode.hashcode001
* nsk.jdi.ShortValue.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ShortValue.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/value/value001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/value/value001.java
index f2da6af509a..fb89e3110e7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/value/value001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/value/value001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -77,7 +77,9 @@ public class value001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/value/value001/TestDescription.java
index ad77a6df319..688f01360b7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/value/value001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/value/value001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.ShortValue.value.value001
* nsk.jdi.ShortValue.value.value001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ShortValue.value.value001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001.java
index caed24680c1..1cab48920c5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -122,7 +122,10 @@ public class bounds001 extends ValueConversionDebugger {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001/TestDescription.java
index 8be93602677..33ffb4cf8e3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -50,7 +50,7 @@
* @clean nsk.jdi.StackFrame._bounds_.bounds001a
* @compile -g:lines,source,vars ../bounds001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame._bounds_.bounds001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002.java
index b4971ee03a2..092e0beb983 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -69,7 +69,10 @@ public class bounds002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002/TestDescription.java
index 9bcadfbcc32..8a65d2be5f8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* @clean nsk.jdi.StackFrame._bounds_.bounds002a
* @compile -g:lines,source,vars ../bounds002a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame._bounds_.bounds002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues001/getArgumentValues001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues001/getArgumentValues001.java
index d88babb2c1a..ca60ceac378 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues001/getArgumentValues001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues001/getArgumentValues001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -52,7 +52,7 @@
* @clean nsk.jdi.StackFrame.getArgumentValues.getArgumentValues001.getArgumentValues001a
* @compile -g:lines,source,vars getArgumentValues001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.getArgumentValues.getArgumentValues001.getArgumentValues001
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -87,7 +87,10 @@ import nsk.share.jdi.*;
*/
public class getArgumentValues001 extends TestDebuggerType2 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues002/getArgumentValues002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues002/getArgumentValues002.java
index d54e4d97767..dbf034bf079 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues002/getArgumentValues002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues002/getArgumentValues002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -36,7 +36,7 @@
* /test/lib
* @build nsk.jdi.StackFrame.getArgumentValues.getArgumentValues002.getArgumentValues002
* nsk.jdi.StackFrame.getArgumentValues.getArgumentValues002.getArgumentValues002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.getArgumentValues.getArgumentValues002.getArgumentValues002
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -63,7 +63,10 @@ import nsk.share.jdi.*;
*/
public class getArgumentValues002 extends TestDebuggerType2 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues003/getArgumentValues003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues003/getArgumentValues003.java
index 969a44ff224..07dcc3712da 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues003/getArgumentValues003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues003/getArgumentValues003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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,7 +35,7 @@
* /test/lib
* @build nsk.jdi.StackFrame.getArgumentValues.getArgumentValues003.getArgumentValues003
* nsk.jdi.StackFrame.getArgumentValues.getArgumentValues003.getArgumentValues003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.getArgumentValues.getArgumentValues003.getArgumentValues003
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -62,7 +62,10 @@ import nsk.share.jdi.*;
*/
public class getArgumentValues003 extends TestDebuggerType2 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001.java
index 2072cf7d267..3364faf11fa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class getvalue001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001/TestDescription.java
index 1664f9f4922..fed2e6cf205 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -84,7 +84,7 @@
* @clean nsk.jdi.StackFrame.getValue.getvalue001a
* @compile -g:lines,source,vars ../getvalue001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.getValue.getvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002.java
index 70585437c1c..4306c1024a9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class getvalue002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002/TestDescription.java
index 6ca1f981795..5ffffa13ff2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -84,7 +84,7 @@
* @clean nsk.jdi.StackFrame.getValue.getvalue002a
* @compile -g:lines,source,vars ../getvalue002a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.getValue.getvalue002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003.java
index 0edc964203e..deaef8e96b6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -78,7 +78,10 @@ public class getvalue003 {
private LocalVariable wrongLocVar;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003/TestDescription.java
index 3421a0f1384..10c618cf3f0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -50,7 +50,7 @@
* @clean nsk.jdi.StackFrame.getValue.getvalue003t
* @compile -g:lines,source,vars ../getvalue003t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.getValue.getvalue003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001.java
index 8471e297026..59f2abab4de 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -80,7 +80,9 @@ public class getvalues001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001/TestDescription.java
index 8da1fa779ab..26bf3b76ad9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -76,7 +76,7 @@
* @clean nsk.jdi.StackFrame.getValues.getvalues001a
* @compile -g:lines,source,vars ../getvalues001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.getValues.getvalues001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002.java
index e1a394ccf3b..0c3b235fdf7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class getvalues002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002/TestDescription.java
index 8961aba6cde..f381d298273 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -84,7 +84,7 @@
* @clean nsk.jdi.StackFrame.getValues.getvalues002a
* @compile -g:lines,source,vars ../getvalues002a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.getValues.getvalues002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003.java
index 97a7ee700e4..6279111d554 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -84,7 +84,10 @@ public class getvalues003 {
private List locVars;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003/TestDescription.java
index 588e22706f5..5b12df4ba31 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -50,7 +50,7 @@
* @clean nsk.jdi.StackFrame.getValues.getvalues003t
* @compile -g:lines,source,vars ../getvalues003t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.getValues.getvalues003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/hashCode/hashcode001.java
index e3b51fa9e29..29d7483c7b3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -70,7 +70,10 @@ public class hashcode001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/hashCode/hashcode001/TestDescription.java
index 95c598039fa..61f59f538c9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.StackFrame.hashCode.hashcode001
* nsk.jdi.StackFrame.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001.java
index 62251b89c9e..408122474b5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class location001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001/TestDescription.java
index d22e0188fee..9a6a220cdf2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@
* /test/lib
* @build nsk.jdi.StackFrame.location.location001
* nsk.jdi.StackFrame.location.location001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.location.location001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.java
index af4bcdc4b9d..910ecff94b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -95,7 +95,7 @@
* @clean nsk.jdi.StackFrame.setValue.setvalue001.setvalue001a
* @compile -g:lines,source,vars setvalue001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.setValue.setvalue001.setvalue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -163,7 +163,9 @@ public class setvalue001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.java
index 57c6b0e1c4b..49544e795d7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -95,7 +95,7 @@
* @clean nsk.jdi.StackFrame.setValue.setvalue002.setvalue002a
* @compile -g:lines,source,vars setvalue002a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.setValue.setvalue002.setvalue002
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -176,7 +176,9 @@ public class setvalue002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.java
index e3f30ec4f84..5470a720801 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -95,7 +95,7 @@
* @clean nsk.jdi.StackFrame.setValue.setvalue003.setvalue003a
* @compile -g:lines,source,vars setvalue003a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.setValue.setvalue003.setvalue003
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -170,7 +170,9 @@ public class setvalue003 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.java
index aa2ca79dfac..5d8010ef48d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -97,7 +97,7 @@
* @clean nsk.jdi.StackFrame.setValue.setvalue004.setvalue004a
* @compile -g:lines,source,vars setvalue004a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.setValue.setvalue004.setvalue004
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -163,7 +163,9 @@ public class setvalue004 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java
index 3b44b776678..561aee37acb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -55,7 +55,7 @@
* @clean nsk.jdi.StackFrame.setValue.setvalue005.setvalue005t
* @compile -g:lines,source,vars setvalue005t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.setValue.setvalue005.setvalue005
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -129,7 +129,10 @@ public class setvalue005 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.java
index 386c3a0ef6f..50b92e96944 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -48,7 +48,7 @@
* @clean nsk.jdi.StackFrame.setValue.setvalue006.setvalue006t
* @compile -g:lines,source,vars setvalue006t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.setValue.setvalue006.setvalue006
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -150,7 +150,10 @@ public class setvalue006 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001.java
index fd27c4297c5..97bd0ed68e7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -80,7 +80,9 @@ public class thisobject001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001/TestDescription.java
index d598932d60f..b776a211cc9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.StackFrame.thisObject.thisobject001
* nsk.jdi.StackFrame.thisObject.thisobject001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.thisObject.thisobject001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002.java
index 054e273cede..92af5040a9d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class thisobject002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002/TestDescription.java
index d43f06f8038..5b361e8d555 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.StackFrame.thisObject.thisobject002
* nsk.jdi.StackFrame.thisObject.thisobject002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.thisObject.thisobject002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001.java
index 616048d618a..e95f92ddee9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,7 +77,9 @@ public class thread001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001/TestDescription.java
index a51a689943c..8ddb4d01eb3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.StackFrame.thread.thread001
* nsk.jdi.StackFrame.thread.thread001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.thread.thread001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/toString/tostring001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/toString/tostring001.java
index b05eb15c7ea..9a9f3bab8ae 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/toString/tostring001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/toString/tostring001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -70,7 +70,10 @@ public class tostring001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/toString/tostring001/TestDescription.java
index d96e8f228b8..cbdf80fd4ad 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/toString/tostring001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/toString/tostring001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.StackFrame.toString.tostring001
* nsk.jdi.StackFrame.toString.tostring001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.toString.tostring001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001.java
index 33af470b981..4502fb235f2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -82,7 +82,9 @@ public class visiblevarbyname001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001/TestDescription.java
index 907b2b9993e..d90bcd80f9f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -82,7 +82,7 @@
* @clean nsk.jdi.StackFrame.visibleVariableByName.visiblevarbyname001a
* @compile -g:lines,source,vars ../visiblevarbyname001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.visibleVariableByName.visiblevarbyname001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002.java
index 25e5f9d452a..9e5c0e3d3d8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -73,7 +73,9 @@ public class visiblevarbyname002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002/TestDescription.java
index d448fac7a6f..35a0d179f74 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.StackFrame.visibleVariableByName.visiblevarbyname002
* nsk.jdi.StackFrame.visibleVariableByName.visiblevarbyname002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.visibleVariableByName.visiblevarbyname002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001.java
index 471a213b86f..32b262071fd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,7 +77,9 @@ public class visiblevariables001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001/TestDescription.java
index 37f253ca707..53a12f2f73d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -96,7 +96,7 @@
* @clean nsk.jdi.StackFrame.visibleVariables.visiblevariables001a
* @compile -g:lines,source,vars ../visiblevariables001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.visibleVariables.visiblevariables001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002.java
index 16feb11b013..f1b00b5a975 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,7 +75,9 @@ public class visiblevariables002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002/TestDescription.java
index d27c3b726d8..dd09af71723 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -85,7 +85,7 @@
* /test/lib
* @build nsk.jdi.StackFrame.visibleVariables.visiblevariables002
* nsk.jdi.StackFrame.visibleVariables.visiblevariables002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StackFrame.visibleVariables.visiblevariables002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.java
index 5e523c369eb..0d77050a222 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -57,7 +57,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.StepEvent._itself_.stepEvent003.stepEvent003
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepEvent._itself_.stepEvent003.stepEvent003
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -80,7 +80,10 @@ import nsk.share.jdi.sde.*;
public class stepEvent003 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java
index f51a346809a..9b911c3cf13 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -62,7 +62,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.StepEvent._itself_.stepEvent004.stepEvent004
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepEvent._itself_.stepEvent004.stepEvent004
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -98,7 +98,10 @@ public class stepEvent004 extends SDEDebugger {
private static final int METHOD10_LINE = 971;
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001.java
index 47bf5432157..7798da0dc73 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,8 +76,11 @@ public class stepevent001 {
static private volatile boolean methodCompleted;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001/TestDescription.java
index 784ed01a080..60152ec37e5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -84,7 +84,7 @@
* /test/lib
* @build nsk.jdi.StepEvent._itself_.stepevent001
* nsk.jdi.StepEvent._itself_.stepevent001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepEvent._itself_.stepevent001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent002.java
index 64514434612..790cbe6e143 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -74,8 +74,11 @@ public class stepevent002 {
static private volatile boolean threadFinished;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent002/TestDescription.java
index 86d040d5e3b..eae01782f63 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -77,7 +77,7 @@
* /test/lib
* @build nsk.jdi.StepEvent._itself_.stepevent002
* nsk.jdi.StepEvent._itself_.stepevent002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepEvent._itself_.stepevent002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001.java
index 4055b762f5b..7ec7b0bb5a0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -59,7 +59,10 @@ public class filters001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001/TestDescription.java
index 20134acf03f..33a412906f5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.StepRequest._bounds_.filters001
* nsk.jdi.StepRequest._bounds_.filters001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest._bounds_.filters001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001.java
index 6146d1476fa..29f656bbd26 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -64,7 +64,10 @@ import java.io.*;
public class filter001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001/TestDescription.java
index 17c303e1b04..d08d3f0e20e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.StepRequest.addClassExclusionFilter.filter001
* nsk.jdi.StepRequest.addClassExclusionFilter.filter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest.addClassExclusionFilter.filter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002.java
index 5fa87598c6b..e53f12004cf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -86,7 +86,9 @@ public class filter002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002/TestDescription.java
index c943f0a4a9a..f70140d8a88 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.StepRequest.addClassExclusionFilter.filter002
* nsk.jdi.StepRequest.addClassExclusionFilter.filter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest.addClassExclusionFilter.filter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001.java
index d6076960d09..c54e6ca4a7a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -70,7 +70,10 @@ import java.io.*;
public class filter_rt001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001/TestDescription.java
index 6c69f98a398..ff885b27ca1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.StepRequest.addClassFilter_rt.filter_rt001
* nsk.jdi.StepRequest.addClassFilter_rt.filter_rt001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest.addClassFilter_rt.filter_rt001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002.java
index 80af7131dd7..e12e48e9ebf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class filter_rt002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002/TestDescription.java
index 78f04fd01f1..058ea24ff2a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.StepRequest.addClassFilter_rt.filter_rt002
* nsk.jdi.StepRequest.addClassFilter_rt.filter_rt002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest.addClassFilter_rt.filter_rt002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003.java
index 2fb842f790a..10bbd4c56f3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,7 +76,10 @@ import java.io.*;
public class filter_rt003 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003/TestDescription.java
index c6f9c53b23b..c55a4e79d99 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.StepRequest.addClassFilter_rt.filter_rt003
* nsk.jdi.StepRequest.addClassFilter_rt.filter_rt003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest.addClassFilter_rt.filter_rt003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001.java
index 4e9e15fb69e..32d9ad97e89 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -63,7 +63,10 @@ import java.io.*;
public class filter_s001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001/TestDescription.java
index a040b4fe965..30a86128472 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.StepRequest.addClassFilter_s.filter_s001
* nsk.jdi.StepRequest.addClassFilter_s.filter_s001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest.addClassFilter_s.filter_s001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002.java
index 2d4c12c906a..db080ef80ed 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class filter_s002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002/TestDescription.java
index 2c90413d1a1..49969336d3a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.StepRequest.addClassFilter_s.filter_s002
* nsk.jdi.StepRequest.addClassFilter_s.filter_s002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest.addClassFilter_s.filter_s002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter001.java
index dbf11610f18..739d206dcf9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,7 +77,10 @@ import java.io.*;
public class instancefilter001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter001/TestDescription.java
index 3a7fb9aefd9..27725a73ac7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -81,7 +81,7 @@
* /test/lib
* @build nsk.jdi.StepRequest.addInstanceFilter.instancefilter001
* nsk.jdi.StepRequest.addInstanceFilter.instancefilter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest.addInstanceFilter.instancefilter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002.java
index cc03f529407..e75a998a07c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class instancefilter002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002/TestDescription.java
index af106279fdd..22d4bb7b829 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.StepRequest.addInstanceFilter.instancefilter002
* nsk.jdi.StepRequest.addInstanceFilter.instancefilter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest.addInstanceFilter.instancefilter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003.java
index 4446fcdcdc8..f4fa3e1bf68 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class instancefilter003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003/TestDescription.java
index 98d4e3587d5..f8365909a72 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.StepRequest.addInstanceFilter.instancefilter003
* nsk.jdi.StepRequest.addInstanceFilter.instancefilter003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest.addInstanceFilter.instancefilter003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter004.java
index 76d6ace6d38..ca1bd6074ab 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -78,7 +78,10 @@ import java.io.*;
public class instancefilter004 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter004/TestDescription.java
index 3153f5032ff..d19b10dde3b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -82,7 +82,7 @@
* /test/lib
* @build nsk.jdi.StepRequest.addInstanceFilter.instancefilter004
* nsk.jdi.StepRequest.addInstanceFilter.instancefilter004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest.addInstanceFilter.instancefilter004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001.java
index 249b6ee05fe..99d24970e6d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class depth001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001/TestDescription.java
index efbdf410a91..a12aa455c42 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.StepRequest.depth.depth001
* nsk.jdi.StepRequest.depth.depth001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest.depth.depth001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002.java
index a3de24fb3d7..09b0fa297b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class depth002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002/TestDescription.java
index 18a26558374..b6eceba8b84 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.StepRequest.depth.depth002
* nsk.jdi.StepRequest.depth.depth002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest.depth.depth002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003.java
index b7281d524fb..ef3668a66e8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class depth003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003/TestDescription.java
index 0589d36c91f..9452b156f10 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.StepRequest.depth.depth003
* nsk.jdi.StepRequest.depth.depth003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest.depth.depth003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001.java
index 6959aa2fed4..33b2c02e8eb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class size001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001/TestDescription.java
index 0604a0a06d1..3b24bcc1007 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.StepRequest.size.size001
* nsk.jdi.StepRequest.size.size001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest.size.size001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002.java
index e25c3d9abd4..5a0df354569 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class size002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002/TestDescription.java
index 443b4195969..2eba448e9d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.StepRequest.size.size002
* nsk.jdi.StepRequest.size.size002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest.size.size002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001.java
index d0207238eb8..8bb9711d37b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class thread001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001/TestDescription.java
index cd5f1803bf8..19048d49147 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.StepRequest.thread.thread001
* nsk.jdi.StepRequest.thread.thread001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StepRequest.thread.thread001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid001.java
index 624f11b221c..d16c308e222 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -58,7 +58,10 @@ import com.sun.jdi.connect.Connector;
public class isvalid001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid001/TestDescription.java
index 14f7e061f7f..a2ed7e22095 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.StringArgument.isValid.isvalid001
- * @run main/othervm
+ * @run driver
* nsk.jdi.StringArgument.isValid.isvalid001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid002.java
index ea4d3f248fa..976112f33c0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -58,7 +58,10 @@ import com.sun.jdi.connect.Connector;
public class isvalid002 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid002/TestDescription.java
index 708fe2d4666..2b41e2b0c89 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.StringArgument.isValid.isvalid002
- * @run main/othervm
+ * @run driver
* nsk.jdi.StringArgument.isValid.isvalid002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid003.java
index 923db27d78a..c138c5b915a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -58,7 +58,10 @@ import com.sun.jdi.connect.Connector;
public class isvalid003 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid003/TestDescription.java
index ebb5b4e9479..236abc2be63 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.StringArgument.isValid.isvalid003
- * @run main/othervm
+ * @run driver
* nsk.jdi.StringArgument.isValid.isvalid003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringReference/value/value001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringReference/value/value001.java
index 85207ce0e77..cce68cfa220 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringReference/value/value001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringReference/value/value001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -65,7 +65,9 @@ public class value001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringReference/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringReference/value/value001/TestDescription.java
index c19fbe7fd17..72eb531617c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringReference/value/value001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringReference/value/value001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.StringReference.value.value001
* nsk.jdi.StringReference.value.value001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.StringReference.value.value001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001.java
index b5a169d5c09..9916bfec01a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -74,8 +74,11 @@ public class thread001 {
static volatile private boolean testFailed = false;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001/TestDescription.java
index 7513f7cf546..b638a58976f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -82,7 +82,7 @@
* /test/lib
* @build nsk.jdi.ThreadDeathEvent.thread.thread001
* nsk.jdi.ThreadDeathEvent.thread.thread001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadDeathEvent.thread.thread001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001.java
index 7a5744f06c1..542a5280d4b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class addthreadfilter001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001/TestDescription.java
index 9fbd01634fa..9f487a50da7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter001
* nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002.java
index c14c28b9e92..4d572e1d12c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -81,7 +81,9 @@ public class addthreadfilter002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002/TestDescription.java
index e299bdb7345..b604ab90f47 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter002
* nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003.java
index 0196795398c..70d9e87fee4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -92,7 +92,9 @@ public class addthreadfilter003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003/TestDescription.java
index 0f53c46f5db..0a92642a589 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter003
* nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter004.java
index 0d875bf0924..a31182cff4e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -74,7 +74,10 @@ import java.io.*;
public class addthreadfilter004 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter004/TestDescription.java
index 1df3c63f4eb..d5afcbe732f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter004
* nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005.java
index f9003f4ba07..30fac8e0aaa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -92,7 +92,9 @@ public class addthreadfilter005 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005/TestDescription.java
index 091e2004062..9ab2e76471b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter005
* nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/name/name001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/name/name001.java
index 0d928783ead..689928f4009 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/name/name001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/name/name001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,7 +75,9 @@ public class name001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/name/name001/TestDescription.java
index ea384466ee2..da2d857bb02 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/name/name001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/name/name001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.ThreadGroupReference.name.name001
* nsk.jdi.ThreadGroupReference.name.name001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadGroupReference.name.name001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/parent/parent001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/parent/parent001.java
index 02deb3031bf..88f42175423 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/parent/parent001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/parent/parent001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -78,7 +78,9 @@ public class parent001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/parent/parent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/parent/parent001/TestDescription.java
index 99c04427d78..4c2d18ef080 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/parent/parent001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/parent/parent001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.ThreadGroupReference.parent.parent001
* nsk.jdi.ThreadGroupReference.parent.parent001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadGroupReference.parent.parent001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/resume/resume001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/resume/resume001.java
index 348c5c9447f..a2fd48a04df 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/resume/resume001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/resume/resume001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class resume001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/resume/resume001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/resume/resume001/TestDescription.java
index 9d2329ce88c..03821ddb9d0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/resume/resume001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/resume/resume001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.ThreadGroupReference.resume.resume001
* nsk.jdi.ThreadGroupReference.resume.resume001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadGroupReference.resume.resume001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/suspend/suspend001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/suspend/suspend001.java
index 637aedccc44..3cf12b9822a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/suspend/suspend001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/suspend/suspend001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -78,7 +78,9 @@ public class suspend001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/suspend/suspend001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/suspend/suspend001/TestDescription.java
index 55436a48a8e..f6906edf871 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/suspend/suspend001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/suspend/suspend001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.ThreadGroupReference.suspend.suspend001
* nsk.jdi.ThreadGroupReference.suspend.suspend001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadGroupReference.suspend.suspend001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threadGroups/threadgroups001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threadGroups/threadgroups001.java
index d66d8f500b4..732746bb820 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threadGroups/threadgroups001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threadGroups/threadgroups001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,7 +77,9 @@ public class threadgroups001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threadGroups/threadgroups001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threadGroups/threadgroups001/TestDescription.java
index 7e3a5128d0a..3067018d29a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threadGroups/threadgroups001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threadGroups/threadgroups001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.ThreadGroupReference.threadGroups.threadgroups001
* nsk.jdi.ThreadGroupReference.threadGroups.threadgroups001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadGroupReference.threadGroups.threadgroups001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threads/threads001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threads/threads001.java
index d8b773faf4d..c1635c605bd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threads/threads001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threads/threads001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,7 +77,9 @@ public class threads001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threads/threads001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threads/threads001/TestDescription.java
index 74fc9d13d11..a0d22cda00f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threads/threads001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threads/threads001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.ThreadGroupReference.threads.threads001
* nsk.jdi.ThreadGroupReference.threads.threads001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadGroupReference.threads.threads001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/toString/tostring001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/toString/tostring001.java
index fb3f9bac0c9..e6da2b78680 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/toString/tostring001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/toString/tostring001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -68,7 +68,10 @@ public class tostring001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/toString/tostring001/TestDescription.java
index db45e112596..d8dc150e5e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/toString/tostring001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/toString/tostring001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -44,7 +44,7 @@
* /test/lib
* @build nsk.jdi.ThreadGroupReference.toString.tostring001
* nsk.jdi.ThreadGroupReference.toString.tostring001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadGroupReference.toString.tostring001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001.java
index d1447e7d91a..13355b1b125 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -71,7 +71,10 @@ public class bounds001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001/TestDescription.java
index 8c1d0e999f8..43ad2618ed2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference._bounds_.bounds001
* nsk.jdi.ThreadReference._bounds_.bounds001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference._bounds_.bounds001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001.java
index b1d2c5b00fa..628dbe17488 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,9 @@ public class currentcm001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001/TestDescription.java
index 96739b3911e..3834bfcb8e9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -76,7 +76,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.currentContendedMonitor.currentcm001
* nsk.jdi.ThreadReference.currentContendedMonitor.currentcm001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.currentContendedMonitor.currentcm001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java
index e8f412e2f4b..6f8385fff8d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -112,7 +112,10 @@ public class forceEarlyReturn001 extends ForceEarlyReturnDebugger {
}
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java
index c4bbfe51b82..e9a089bb0a3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn002.forceEarlyReturn002
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn002.forceEarlyReturn002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn002.forceEarlyReturn002
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -66,7 +66,10 @@ import nsk.share.jdi.ForceEarlyReturnDebugger;
public class forceEarlyReturn002 extends ForceEarlyReturnDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public String debuggeeClassName() {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn003/forceEarlyReturn003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn003/forceEarlyReturn003.java
index 796f88fb772..4bb16585518 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn003/forceEarlyReturn003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn003/forceEarlyReturn003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -45,7 +45,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn003.forceEarlyReturn003
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn003.forceEarlyReturn003
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -66,7 +66,10 @@ import nsk.share.jpda.*;
public class forceEarlyReturn003 extends ForceEarlyReturnDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public String debuggeeClassName() {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/forceEarlyReturn004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/forceEarlyReturn004.java
index 4154f728cb0..c5b35ef43d8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/forceEarlyReturn004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/forceEarlyReturn004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -58,7 +58,10 @@ import nsk.share.jdi.ForceEarlyReturnDebugger;
public class forceEarlyReturn004 extends ForceEarlyReturnDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public String debuggeeClassName() {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn005/forceEarlyReturn005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn005/forceEarlyReturn005.java
index 14f50fd9c24..49ab128d7df 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn005/forceEarlyReturn005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn005/forceEarlyReturn005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -74,7 +74,10 @@ import nsk.share.jdi.ForceEarlyReturnDebugger;
public class forceEarlyReturn005 extends ForceEarlyReturnDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public String debuggeeClassName() {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn006/TestDescription.java
index 7e79b98e1f9..02bd5c864e3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn007/TestDescription.java
index 19135187b86..32ba47a1b3c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn007/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn008/forceEarlyReturn008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn008/forceEarlyReturn008.java
index c4abb8a7bcc..3ae511110dd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn008/forceEarlyReturn008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn008/forceEarlyReturn008.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn008.forceEarlyReturn008
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn008.forceEarlyReturn008a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn008.forceEarlyReturn008
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -94,7 +94,10 @@ import nsk.share.jdi.ForceEarlyReturnDebugger;
public class forceEarlyReturn008 extends ForceEarlyReturnDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public String debuggeeClassName() {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn009/forceEarlyReturn009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn009/forceEarlyReturn009.java
index 79ce3e1221b..f98c4dd1f4e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn009/forceEarlyReturn009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn009/forceEarlyReturn009.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -49,7 +49,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -71,7 +71,10 @@ import nsk.share.jdi.ForceEarlyReturnDebugger;
public class forceEarlyReturn009 extends ForceEarlyReturnDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public String debuggeeClassName() {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn010/TestDescription.java
index 7c133540d5d..1ab4dad396b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn010/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn010/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn011/TestDescription.java
index 0d680b868a6..7c3b351d706 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn011/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn011/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,7 +45,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn012/TestDescription.java
index faccfb08292..f45c1ce653f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn012/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn012/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -46,7 +46,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn013/forceEarlyReturn013.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn013/forceEarlyReturn013.java
index d0da4ab0dbd..2673e7f3b3f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn013/forceEarlyReturn013.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn013/forceEarlyReturn013.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -50,7 +50,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn013.forceEarlyReturn013
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn013.forceEarlyReturn013a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn013.forceEarlyReturn013
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -71,7 +71,10 @@ import nsk.share.jdi.ForceEarlyReturnDebugger;
public class forceEarlyReturn013 extends ForceEarlyReturnDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public String debuggeeClassName() {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn014/forceEarlyReturn014.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn014/forceEarlyReturn014.java
index 9ea8b30d356..601bd97bba7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn014/forceEarlyReturn014.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn014/forceEarlyReturn014.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -47,7 +47,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn014.forceEarlyReturn014
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn014.forceEarlyReturn014a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn014.forceEarlyReturn014
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -68,7 +68,10 @@ import nsk.share.jdi.ForceEarlyReturnDebugger;
public class forceEarlyReturn014 extends ForceEarlyReturnDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public String debuggeeClassName() {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn015/forceEarlyReturn015.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn015/forceEarlyReturn015.java
index 7bd8403d2b2..00908f1d8f9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn015/forceEarlyReturn015.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn015/forceEarlyReturn015.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -39,7 +39,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn015.forceEarlyReturn015
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn015.forceEarlyReturn015a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn015.forceEarlyReturn015
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -61,7 +61,10 @@ import nsk.share.jdi.ForceEarlyReturnDebugger;
public class forceEarlyReturn015 extends ForceEarlyReturnDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public String debuggeeClassName() {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001.java
index 337b38e28fe..85ac08b35a8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -93,7 +93,9 @@ public class frame001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001/TestDescription.java
index abe520cd2e9..575cfcd09fc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.frame.frame001
* nsk.jdi.ThreadReference.frame.frame001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.frame.frame001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001.java
index fe36b643e45..60610373b86 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -86,7 +86,9 @@ public class framecount001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001/TestDescription.java
index 342bcd1efb0..c3a986ebc2c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.frameCount.framecount001
* nsk.jdi.ThreadReference.frameCount.framecount001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.frameCount.framecount001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001.java
index 2e361e65cab..11827a71170 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -96,7 +96,9 @@ public class frames001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001/TestDescription.java
index 4fe12906ee5..82d9b8bdbe1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.frames.frames001
* nsk.jdi.ThreadReference.frames.frames001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.frames.frames001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001.java
index 7196e9b464c..3ac9a39da88 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -97,7 +97,9 @@ public class frames_ii001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001/TestDescription.java
index 37ebcd218f6..dc7d517be68 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -87,7 +87,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.frames_ii.frames_ii001
* nsk.jdi.ThreadReference.frames_ii.frames_ii001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.frames_ii.frames_ii001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002.java
index 1a7a28f86c5..0109d783e97 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -81,7 +81,9 @@ public class frames_ii002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002/TestDescription.java
index 1df66298711..746dc222509 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.frames_ii.frames_ii002
* nsk.jdi.ThreadReference.frames_ii.frames_ii002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.frames_ii.frames_ii002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001.java
index a1e347b5b73..34e1b6d6c14 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,7 +69,9 @@ public class interrupt001 {
public static void main(String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001/TestDescription.java
index 6dccb806365..49cc8de9150 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.interrupt.interrupt001
* nsk.jdi.ThreadReference.interrupt.interrupt001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.interrupt.interrupt001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001.java
index 61b7b7e5207..ff41fb4caaf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,7 +76,9 @@ public class isatbreakpoint001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001/TestDescription.java
index 7d3cf9a061d..a4b4614b8b6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.isAtBreakpoint.isatbreakpoint001
* nsk.jdi.ThreadReference.isAtBreakpoint.isatbreakpoint001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.isAtBreakpoint.isatbreakpoint001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001.java
index ee9e770f936..99b1ddd1f5a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -83,7 +83,9 @@ public class issuspended001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001/TestDescription.java
index f598a81a916..a0dfe45c65a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.isSuspended.issuspended001
* nsk.jdi.ThreadReference.isSuspended.issuspended001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.isSuspended.issuspended001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002.java
index bc9e860a053..3fb49c0c262 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -83,7 +83,9 @@ public class issuspended002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java
index d66d07eb91a..85cb8a67607 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.isSuspended.issuspended002
* nsk.jdi.ThreadReference.isSuspended.issuspended002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.isSuspended.issuspended002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003.java
index 70ecccee228..81549caccb4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -81,7 +81,9 @@ public class issuspended003 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003/TestDescription.java
index 5fb3c43c941..82a58634679 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.isSuspended.issuspended003
* nsk.jdi.ThreadReference.isSuspended.issuspended003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.isSuspended.issuspended003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004.java
index c46a55cd01a..799ca455f47 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class issuspended004 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004/TestDescription.java
index 007d556ce6b..4444ed671ae 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.isSuspended.issuspended004
* nsk.jdi.ThreadReference.isSuspended.issuspended004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.isSuspended.issuspended004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001.java
index bd1b2b3f32f..219930df6b9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -71,7 +71,9 @@ public class name001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001/TestDescription.java
index 3308aa2afd0..e0a5f370180 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.name.name001
* nsk.jdi.ThreadReference.name.name001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.name.name001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001.java
index 608d3410639..086d5b85909 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -58,7 +58,9 @@ public class ownedmonitors001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001/TestDescription.java
index 5f7aff450e3..7e6ac56e80b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.ownedMonitors.ownedmonitors001
* nsk.jdi.ThreadReference.ownedMonitors.ownedmonitors001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.ownedMonitors.ownedmonitors001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002.java
index 839a81f4484..733407a2ac3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -64,7 +64,10 @@ public class ownedmonitors002 {
private int tot_res = Consts.TEST_PASSED;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002/TestDescription.java
index 44af178049f..7b9c6e94498 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -41,7 +41,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.ownedMonitors.ownedmonitors002
* nsk.jdi.ThreadReference.ownedMonitors.ownedmonitors002t
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.ownedMonitors.ownedmonitors002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames001/ownedMonitorsAndFrames001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames001/ownedMonitorsAndFrames001.java
index 57cabe088a0..9c2f2539bb9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames001/ownedMonitorsAndFrames001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames001/ownedMonitorsAndFrames001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -43,7 +43,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames001.ownedMonitorsAndFrames001
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames001.ownedMonitorsAndFrames001
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -64,7 +64,10 @@ import nsk.share.jpda.AbstractDebuggeeTest;
public class ownedMonitorsAndFrames001 extends TestDebuggerType2 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames002/ownedMonitorsAndFrames002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames002/ownedMonitorsAndFrames002.java
index d10b8bbfbfb..af6341634cc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames002/ownedMonitorsAndFrames002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames002/ownedMonitorsAndFrames002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -71,7 +71,10 @@ import nsk.share.locks.LockingThread;
public class ownedMonitorsAndFrames002 extends OwnedMonitorsDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames003/ownedMonitorsAndFrames003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames003/ownedMonitorsAndFrames003.java
index 733b0947cec..e033e4f392b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames003/ownedMonitorsAndFrames003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames003/ownedMonitorsAndFrames003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -70,7 +70,10 @@ import nsk.share.Consts;
public class ownedMonitorsAndFrames003 extends OwnedMonitorsDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames004/ownedMonitorsAndFrames004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames004/ownedMonitorsAndFrames004.java
index 85741a0d58b..033085f8808 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames004/ownedMonitorsAndFrames004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames004/ownedMonitorsAndFrames004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -66,7 +66,10 @@ import nsk.share.locks.LockType;
public class ownedMonitorsAndFrames004 extends OwnedMonitorsDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames005/ownedMonitorsAndFrames005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames005/ownedMonitorsAndFrames005.java
index fcd27177a70..d8b751d70c9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames005/ownedMonitorsAndFrames005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames005/ownedMonitorsAndFrames005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -68,7 +68,10 @@ import nsk.share.locks.LockingThread;
public class ownedMonitorsAndFrames005 extends OwnedMonitorsDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames006/ownedMonitorsAndFrames006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames006/ownedMonitorsAndFrames006.java
index 575572839be..dbd66f04cf6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames006/ownedMonitorsAndFrames006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames006/ownedMonitorsAndFrames006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -71,7 +71,10 @@ import com.sun.jdi.ThreadReference;
public class ownedMonitorsAndFrames006 extends OwnedMonitorsDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames007/ownedMonitorsAndFrames007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames007/ownedMonitorsAndFrames007.java
index c11acfe975e..dec8e93183c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames007/ownedMonitorsAndFrames007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames007/ownedMonitorsAndFrames007.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -73,7 +73,10 @@ import nsk.share.locks.LockingThread;
public class ownedMonitorsAndFrames007 extends OwnedMonitorsDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames009/ownedMonitorsAndFrames009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames009/ownedMonitorsAndFrames009.java
index 39d0bcb81d0..41b5a33feca 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames009/ownedMonitorsAndFrames009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames009/ownedMonitorsAndFrames009.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -65,7 +65,10 @@ import nsk.share.jdi.OwnedMonitorsDebugger;
public class ownedMonitorsAndFrames009 extends OwnedMonitorsDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001.java
index 51f51da29ef..69c30d0aa24 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -97,7 +97,9 @@ public class popframes001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001/TestDescription.java
index 2d78c91dc78..e8799ce2c8e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -109,7 +109,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.popFrames.popframes001
* nsk.jdi.ThreadReference.popFrames.popframes001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.popFrames.popframes001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002.java
index 4f75c90b312..2e5b28c2dfc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -89,7 +89,9 @@ public class popframes002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002/TestDescription.java
index 1994de55722..43d6bde7803 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -105,7 +105,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.popFrames.popframes002
* nsk.jdi.ThreadReference.popFrames.popframes002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.popFrames.popframes002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003.java
index f4a7fb4e380..27866885bdb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class popframes003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003/TestDescription.java
index 2b4da756261..e2fe901573f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -105,7 +105,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.popFrames.popframes003
* nsk.jdi.ThreadReference.popFrames.popframes003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.popFrames.popframes003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004.java
index 7ca95a46c65..5e06aec1810 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,9 @@ public class popframes004 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004/TestDescription.java
index 9547632f839..03ac6e5aeb8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -104,7 +104,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.popFrames.popframes004
* nsk.jdi.ThreadReference.popFrames.popframes004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.popFrames.popframes004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005.java
index 7d221fb4db0..7618a200e28 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -91,7 +91,9 @@ public class popframes005 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005/TestDescription.java
index 1103a2f3ac8..a5a108d7fdf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -105,7 +105,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.popFrames.popframes005
* nsk.jdi.ThreadReference.popFrames.popframes005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.popFrames.popframes005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006.java
index 185ec14a7bc..9704684e789 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -79,7 +79,10 @@ public class popframes006 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006/TestDescription.java
index c2d06a1d80e..1b0a10c89be 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* @clean nsk.jdi.ThreadReference.popFrames.popframes006t
* @compile -g:lines,source,vars ../popframes006t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.popFrames.popframes006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007.java
index c4c25cd2a40..64377a06095 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -79,7 +79,10 @@ public class popframes007 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007/TestDescription.java
index aea380870f7..fba6f0f5f10 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* @clean nsk.jdi.ThreadReference.popFrames.popframes007t
* @compile -g:lines,source,vars ../popframes007t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.popFrames.popframes007
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001.java
index df7e338b186..c98248eeb51 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,7 +76,9 @@ public class resume001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001/TestDescription.java
index 90f57fc35ad..0215756b987 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.resume.resume001
* nsk.jdi.ThreadReference.resume.resume001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.resume.resume001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status003/status003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status003/status003.java
index 6f2d891873a..38505440238 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status003/status003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status003/status003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.status.status003.status003
* nsk.jdi.ThreadReference.status.status003.status003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.status.status003.status003
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -120,7 +120,10 @@ public class status003 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status004/status004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status004/status004.java
index 0e0501b4eeb..d0415a34ca9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status004/status004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status004/status004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.status.status004.status004
* nsk.jdi.ThreadReference.status.status004.status004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.status.status004.status004
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -116,7 +116,10 @@ public class status004 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status005/status005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status005/status005.java
index 941de937786..7d80889fe49 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status005/status005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status005/status005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.status.status005.status005
* nsk.jdi.ThreadReference.status.status005.status005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.status.status005.status005
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -116,7 +116,10 @@ public class status005 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status006/status006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status006/status006.java
index 5fbb1a84d26..b4924dc6a47 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status006/status006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status006/status006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.status.status006.status006
* nsk.jdi.ThreadReference.status.status006.status006a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.status.status006.status006
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -119,7 +119,10 @@ public class status006 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status007/status007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status007/status007.java
index 3013eda0cc0..341a00f3352 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status007/status007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status007/status007.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -55,7 +55,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.status.status007.status007
* nsk.jdi.ThreadReference.status.status007.status007a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.status.status007.status007
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -111,7 +111,10 @@ public class status007 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status008/status008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status008/status008.java
index e70f9897621..b348a79cbba 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status008/status008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status008/status008.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.status.status008.status008
* nsk.jdi.ThreadReference.status.status008.status008a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.status.status008.status008
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -115,7 +115,10 @@ public class status008 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001.java
index 5c04f30145c..c1baa909eec 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -81,7 +81,9 @@ public class stop001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java
index d4b33afd75d..f66f60b1021 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.stop.stop001
* nsk.jdi.ThreadReference.stop.stop001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.stop.stop001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002.java
index de8ee1df617..53a607fdc29 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -88,7 +88,10 @@ public class stop002 {
private volatile boolean gotEvent = false;
public static void main (String argv[]) {
- System.exit(run(argv,System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002/TestDescription.java
index 4a16e986cbd..ca52d0596ee 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* @clean nsk.jdi.ThreadReference.stop.stop002t
* @compile -g:lines,source,vars ../stop002t.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.stop.stop002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001.java
index 5d4ac657bb9..92ba863bbf2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,7 +76,9 @@ public class suspend001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001.java
index b3678efb96a..e6608f96646 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -75,7 +75,9 @@ public class suspendcount001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001/TestDescription.java
index 56bb1a771e7..c4974f216d4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.suspendCount.suspendcount001
* nsk.jdi.ThreadReference.suspendCount.suspendcount001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.suspendCount.suspendcount001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001.java
index d6443894715..54396dd8c24 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,9 @@ public class threadgroup001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001/TestDescription.java
index 050b1c14b72..0c16adda444 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.ThreadReference.threadGroup.threadgroup001
* nsk.jdi.ThreadReference.threadGroup.threadgroup001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadReference.threadGroup.threadgroup001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001.java
index 0ec0b83b304..5cc604adc1a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,8 +69,11 @@ public class thread001 {
static private boolean eventsReceived;
static private long eventTimeout;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001/TestDescription.java
index 0c309dc979e..abcc5e8a18a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -85,7 +85,7 @@
* /test/lib
* @build nsk.jdi.ThreadStartEvent.thread.thread001
* nsk.jdi.ThreadStartEvent.thread.thread001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadStartEvent.thread.thread001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001.java
index 3cc2cc9e321..ace63e511aa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class addthreadfilter001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001/TestDescription.java
index 2bdd0fdc59d..95fa7495f6e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter001
* nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002.java
index 5ff5b8e8354..9b040a17eb1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -94,7 +94,9 @@ public class addthreadfilter002 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002/TestDescription.java
index 12505b1298a..20f2f6ce7b6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter002
* nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003.java
index ccdadd2e4b5..21cf8a9d164 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -92,7 +92,9 @@ public class addthreadfilter003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003/TestDescription.java
index 0bc4460e0d5..83a961154a2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter003
* nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter004.java
index bb744b3208f..d1bf0f532d4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -74,7 +74,10 @@ import java.io.*;
public class addthreadfilter004 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter004/TestDescription.java
index 847f1704574..7f7eac6ed64 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter004
* nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005.java
index d43e0257d7e..8dad0781d16 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class addthreadfilter005 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005/TestDescription.java
index a210a76d533..4308f0b30f7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter005
* nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Transport/name/name001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Transport/name/name001.java
index 6d129e722ca..32aafb0ce80 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Transport/name/name001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Transport/name/name001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -58,7 +58,10 @@ import com.sun.jdi.connect.Transport;
public class name001 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + 95); // JCK-compatible exit status
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Transport/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Transport/name/name001/TestDescription.java
index 28e683f0db5..19960668113 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Transport/name/name001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Transport/name/name001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.Transport.name.name001
- * @run main/othervm
+ * @run driver
* nsk.jdi.Transport.name.name001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/hashCode/hashcode001.java
index 66f47634a30..372b610ed62 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/hashCode/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -86,7 +86,10 @@ public class hashcode001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/hashCode/hashcode001/TestDescription.java
index 7fc4f4905aa..7fa9d84a40f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/hashCode/hashcode001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/hashCode/hashcode001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.Type.hashCode.hashcode001
* nsk.jdi.Type.hashCode.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Type.hashCode.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name001.java
index 18aa4a20782..3da326aebd5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class name001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name001/TestDescription.java
index 3fc4db5b173..a6a68ed4fc7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.Type.name.name001
* nsk.jdi.Type.name.name001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Type.name.name001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name002.java
index 3e70971d18b..77844de4735 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -71,7 +71,9 @@ public class name002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name002/TestDescription.java
index d61002c13db..0a3c6223b09 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.Type.name.name002
* nsk.jdi.Type.name.name002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Type.name.name002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name003.java
index 79acce3cc06..546c7d4bae5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -64,7 +64,9 @@ public class name003 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name003/TestDescription.java
index 84a010425ab..ea4deca0799 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.Type.name.name003
* nsk.jdi.Type.name.name003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Type.name.name003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature001.java
index 0fb81efe219..0f0f5f8d81a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -87,7 +87,9 @@ public class signature001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature001/TestDescription.java
index d8bd0fd2c2b..e8d55590894 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.Type.signature.signature001
* nsk.jdi.Type.signature.signature001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Type.signature.signature001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature002.java
index 73958b3d72e..8939b973854 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -70,7 +70,9 @@ public class signature002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature002/TestDescription.java
index bf9013fd4e1..af20ef2ec4e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.Type.signature.signature002
* nsk.jdi.Type.signature.signature002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Type.signature.signature002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature003.java
index 054df781090..28ef42921b0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -64,7 +64,9 @@ public class signature003 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature003/TestDescription.java
index 992051570a6..f6895b77c0a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.Type.signature.signature003
* nsk.jdi.Type.signature.signature003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Type.signature.signature003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype001.java
index e31155abf67..408f5185ef8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -107,7 +107,10 @@ public class decltype001 {
private final static String mainInterName = prefix + "MainInter";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype001/TestDescription.java
index fd96f6b0bcd..0cb5703a663 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -50,7 +50,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.declaringType.decltype001
* nsk.jdi.TypeComponent.declaringType.decltype001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.declaringType.decltype001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype002.java
index 2093e40c4ac..be564c9de35 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -108,7 +108,10 @@ public class decltype002 {
private final static String sameInterName = prefix + "decltype002aSameInter";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype002/TestDescription.java
index 786fd77d51b..73818382022 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.declaringType.decltype002
* nsk.jdi.TypeComponent.declaringType.decltype002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.declaringType.decltype002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype003.java
index d1af14dd610..05b987365a4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -106,7 +106,10 @@ public class decltype003 {
private final static String overInterName = prefix + "decltype003aOverridenInter";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype003/TestDescription.java
index 3ea8af1e640..cb4f032b87a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.declaringType.decltype003
* nsk.jdi.TypeComponent.declaringType.decltype003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.declaringType.decltype003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype004.java
index 6dcef73ea31..c3c1698185a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -106,7 +106,10 @@ public class decltype004 {
private final static String mainInterName = prefix + "decltype004aMainInter";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype004/TestDescription.java
index c016aa094cc..9a4fea87a68 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -49,7 +49,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.declaringType.decltype004
* nsk.jdi.TypeComponent.declaringType.decltype004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.declaringType.decltype004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype005.java
index 2a5379b510e..1afffce9ce2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -108,7 +108,10 @@ public class decltype005 {
private final static String sameInterName = prefix + "decltype005aSameInter";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype005/TestDescription.java
index ca8be89b45d..833e8ad9be4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.declaringType.decltype005
* nsk.jdi.TypeComponent.declaringType.decltype005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.declaringType.decltype005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype006.java
index 0787af781d6..16ca5ff3325 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -102,7 +102,10 @@ public class decltype006 {
private final static String overInterName = prefix + "decltype006aOverridenInter";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype006/TestDescription.java
index 81ee182e92d..1e5e350f08c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.declaringType.decltype006
* nsk.jdi.TypeComponent.declaringType.decltype006a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.declaringType.decltype006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype007.java
index b63ecf1849e..b9f90616ad5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype007.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -42,7 +42,10 @@ public class decltype007 {
private final static String mainClassName = prefix + "decltype007aMainClass";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype007/TestDescription.java
index d185a4ce9f5..080dc66421b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype007/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.declaringType.decltype007
* nsk.jdi.TypeComponent.declaringType.decltype007a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.declaringType.decltype007
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype008.java
index 6f21d63e9d9..669c7babb49 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype008.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -42,7 +42,10 @@ public class decltype008 {
private final static String otherClassName = prefix + "decltype008aOtherClass";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype008/TestDescription.java
index 7c81dd97672..f6b8a8a90d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype008/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.declaringType.decltype008
* nsk.jdi.TypeComponent.declaringType.decltype008a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.declaringType.decltype008
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype009.java
index 9681c05fb04..fc4e736c1ed 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype009.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -65,7 +65,10 @@ public class decltype009 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype009/TestDescription.java
index 08249a079ad..0dd31b8d2f2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype009/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype009/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -53,7 +53,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.declaringType.decltype009
* nsk.jdi.TypeComponent.declaringType.decltype009a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.declaringType.decltype009
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001.java
index 498e6adefaa..c23ff079c0e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -149,13 +149,12 @@ public class genericSignature001 {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int result = run(argv, System.out);
- System.exit(result + STATUS_TEMP);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001/TestDescription.java
index 89e2d53b30f..26b56f35f2d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -49,7 +49,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.genericSignature.genericSignature001
* nsk.jdi.TypeComponent.genericSignature.genericSignature001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.genericSignature.genericSignature001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002.java
index 0257c81a9b5..cb596163da1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -141,13 +141,12 @@ public class genericSignature002 {
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- int result = run(argv, System.out);
- System.exit(result + STATUS_TEMP);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002/TestDescription.java
index dfb660a9ba0..d0549ae54ef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.genericSignature.genericSignature002
* nsk.jdi.TypeComponent.genericSignature.genericSignature002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.genericSignature.genericSignature002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal001.java
index f88290841e4..d161aba4f8a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -222,7 +222,10 @@ public class isfinal001 {
private final static String classToCheckName = prefix + "isfinal001aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal001/TestDescription.java
index 6dd539af43d..194334d4bf5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isFinal.isfinal001
* nsk.jdi.TypeComponent.isFinal.isfinal001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isFinal.isfinal001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal002.java
index d9b10503f59..b141435bf8f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -265,7 +265,10 @@ public class isfinal002 {
private final static String classToCheckName = prefix + "isfinal002aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal002/TestDescription.java
index 814cf2de738..22da431f625 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isFinal.isfinal002
* nsk.jdi.TypeComponent.isFinal.isfinal002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isFinal.isfinal002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal003.java
index ff67f43c5dd..d4badb885bc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -41,7 +41,10 @@ public class isfinal003 {
private final static String classToCheckName = prefix + "isfinal003aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal003/TestDescription.java
index 46bdd35932c..d56a3e080b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isFinal.isfinal003
* nsk.jdi.TypeComponent.isFinal.isfinal003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isFinal.isfinal003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal004.java
index 66934851fdf..51c52322fe6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -65,7 +65,10 @@ public class isfinal004 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal004/TestDescription.java
index b1ca097ede8..d165ccb1bf9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isFinal.isfinal004
* nsk.jdi.TypeComponent.isFinal.isfinal004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isFinal.isfinal004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate001.java
index 889a2604edd..4e0f239bf81 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -98,12 +98,12 @@ public class ispackageprivate001 {
{"m0", NOT_PPRIVATE}, {"m1", NOT_PPRIVATE}, {"m2", NOT_PPRIVATE}
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate001/TestDescription.java
index b32fcee0316..f602776a941 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isPackagePrivate.ispackageprivate001
* nsk.jdi.TypeComponent.isPackagePrivate.ispackageprivate001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isPackagePrivate.ispackageprivate001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate002.java
index 04583e6c8f2..07cbd7ecff5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -41,12 +41,12 @@ public class ispackageprivate002 {
private static ReferenceType debuggeeClass;
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate002/TestDescription.java
index 3f06b625753..6e2b4555a0c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isPackagePrivate.ispackageprivate002
* nsk.jdi.TypeComponent.isPackagePrivate.ispackageprivate002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isPackagePrivate.ispackageprivate002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate001.java
index bab410e1145..b6570c88d08 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -98,12 +98,12 @@ public class isprivate001 {
{"m0", NOT_PRIVATE}, {"m1", NOT_PRIVATE}, {"m2", NOT_PRIVATE}
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate001/TestDescription.java
index f1b91b06354..03251e87637 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isPrivate.isprivate001
* nsk.jdi.TypeComponent.isPrivate.isprivate001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isPrivate.isprivate001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate002.java
index 3abff8e1a7c..560e298dcf2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -41,12 +41,12 @@ public class isprivate002 {
private static ReferenceType debuggeeClass;
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate002/TestDescription.java
index d4dc79142c8..bc943c0423e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isPrivate.isprivate002
* nsk.jdi.TypeComponent.isPrivate.isprivate002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isPrivate.isprivate002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected001.java
index 3c422c62019..00bcb6c42ef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -98,12 +98,12 @@ public class isprotected001 {
{"m0", NOT_PROTECTED}, {"m1", NOT_PROTECTED}, {"m2", NOT_PROTECTED}
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected001/TestDescription.java
index 9a99e868e87..b223fe21761 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isProtected.isprotected001
* nsk.jdi.TypeComponent.isProtected.isprotected001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isProtected.isprotected001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected002.java
index 3b6a3a891f0..6b20dbed2ec 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -41,12 +41,12 @@ public class isprotected002 {
private static ReferenceType debuggeeClass;
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected002/TestDescription.java
index 06ee7260565..2f5459d48e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isProtected.isprotected002
* nsk.jdi.TypeComponent.isProtected.isprotected002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isProtected.isprotected002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic001.java
index 83961f8ba0b..953fcfb2832 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -98,12 +98,12 @@ public class ispublic001 {
{"m0", NOT_PUBLIC}, {"m1", NOT_PUBLIC}, {"m2", NOT_PUBLIC}
};
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic001/TestDescription.java
index 23d664d1b38..766c2db6887 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isPublic.ispublic001
* nsk.jdi.TypeComponent.isPublic.ispublic001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isPublic.ispublic001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic002.java
index 3b9725280d3..9c5ea3c40f1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -41,12 +41,12 @@ public class ispublic002 {
private static ReferenceType debuggeeClass;
- /**
- * Re-call to run(args,out), and exit with
- * either status 95 or 97 (JCK-like exit status).
- */
+
public static void main (String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
/**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic002/TestDescription.java
index c7a17646423..12709e8c00d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isPublic.ispublic002
* nsk.jdi.TypeComponent.isPublic.ispublic002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isPublic.ispublic002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic001.java
index 16f5dde6ccc..a127a38bc50 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -231,7 +231,10 @@ public class isstatic001 {
private final static String classToCheckName = prefix + "ClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic001/TestDescription.java
index 151fef1060b..6a62b6217ce 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isStatic.isstatic001
* nsk.jdi.TypeComponent.isStatic.isstatic001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isStatic.isstatic001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic002.java
index 2b0411fd423..5e62231d8b1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -265,7 +265,10 @@ public class isstatic002 {
private final static String classToCheckName = prefix + "isstatic002aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic002/TestDescription.java
index f8318a95191..03b162a5574 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isStatic.isstatic002
* nsk.jdi.TypeComponent.isStatic.isstatic002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isStatic.isstatic002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic003.java
index 00996cdaf9b..aacfa14a318 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -41,7 +41,10 @@ public class isstatic003 {
private final static String classToCheckName = prefix + "isstatic003aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic003/TestDescription.java
index 8d4c4eb5be2..f02181126b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isStatic.isstatic003
* nsk.jdi.TypeComponent.isStatic.isstatic003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isStatic.isstatic003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic004.java
index 922c85a32f0..e66a202e45e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -65,7 +65,10 @@ public class isstatic004 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic004/TestDescription.java
index 4f584842364..5bcce2d4dde 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isStatic.isstatic004
* nsk.jdi.TypeComponent.isStatic.isstatic004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isStatic.isstatic004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic001.java
index 8bf280dd2cd..2b8b51e9ec0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,7 +77,10 @@ public class issynthetic001 {
private final static String classToCheckName = prefix + "ClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic001/TestDescription.java
index 3134afaafba..125bae50fbb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isSynthetic.issynthetic001
* nsk.jdi.TypeComponent.isSynthetic.issynthetic001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isSynthetic.issynthetic001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002.java
index c79bc92c3ea..d70d278d456 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -46,7 +46,10 @@ public class issynthetic002 {
private final static String classToCheckName = prefix + "issynthetic002aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002/TestDescription.java
index bfdc8bd584c..2f6cd054ef9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.isSynthetic.issynthetic002
* nsk.jdi.TypeComponent.isSynthetic.issynthetic002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.isSynthetic.issynthetic002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name001.java
index 7d12ab2471f..7aca39b5499 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,10 @@ public class name001 {
private final static String classToCheckName = prefix + "ClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name001/TestDescription.java
index ba2bfaa75a1..6fa301e448c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -49,7 +49,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.name.name001
* nsk.jdi.TypeComponent.name.name001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.name.name001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name002.java
index fdc3cb3c57b..830d70b2d1d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,10 @@ public class name002 {
private final static String classToCheckName = prefix + "name002aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name002/TestDescription.java
index 9f8a6f2d777..d660ee7f450 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -49,7 +49,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.name.name002
* nsk.jdi.TypeComponent.name.name002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.name.name002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name003.java
index 9eb4f553dd1..947d4c216be 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -41,7 +41,10 @@ public class name003 {
private final static String classToCheckName = prefix + "name003aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name003/TestDescription.java
index 60f060ae6bd..9dbe4cf09f1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.name.name003
* nsk.jdi.TypeComponent.name.name003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.name.name003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign001.java
index b44ac0265d7..73185850ed4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -140,7 +140,10 @@ public class sign001 {
private final static String classToCheckName = prefix + "ClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign001/TestDescription.java
index 4e6be5309cd..57140d7ce22 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.signature.sign001
* nsk.jdi.TypeComponent.signature.sign001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.signature.sign001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign002.java
index 3072849d5b2..b5d44fd7d02 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -159,7 +159,10 @@ public class sign002 {
private final static String classToCheckName = prefix + "sign002aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign002/TestDescription.java
index bb8eba626ad..aeb5ace6d3a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.signature.sign002
* nsk.jdi.TypeComponent.signature.sign002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.signature.sign002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign003.java
index 804e8ad6c23..354a3a2068e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -51,7 +51,10 @@ public class sign003 {
private final static String classToCheckName = prefix + "sign003aClassToCheck";
public static void main(String argv[]) {
- System.exit(95 + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign003/TestDescription.java
index 156b6312bd9..830d87cadb7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.TypeComponent.signature.sign003
* nsk.jdi.TypeComponent.signature.sign003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.TypeComponent.signature.sign003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMCannotBeModifiedEx/_itself_/canntbemod001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMCannotBeModifiedEx/_itself_/canntbemod001.java
index e3d5b590092..7af0f2a32b9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMCannotBeModifiedEx/_itself_/canntbemod001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMCannotBeModifiedEx/_itself_/canntbemod001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -51,7 +51,10 @@ public class canntbemod001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMCannotBeModifiedEx/_itself_/canntbemod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMCannotBeModifiedEx/_itself_/canntbemod001/TestDescription.java
index 5f3b4f6e38a..91bc71dbe48 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMCannotBeModifiedEx/_itself_/canntbemod001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMCannotBeModifiedEx/_itself_/canntbemod001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -37,7 +37,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.VMCannotBeModifiedEx._itself_.canntbemod001
- * @run main/othervm
+ * @run driver
* nsk.jdi.VMCannotBeModifiedEx._itself_.canntbemod001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath001.java
index 2409172f9aa..7d5e0b71767 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -58,8 +58,11 @@ public class vmdeath001 {
static private boolean disconnectReceived;
static private boolean vmdeathIsPrior;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath001/TestDescription.java
index 76de38122f5..e4733bc8daf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.VMDeathEvent._itself_.vmdeath001
* nsk.jdi.VMDeathEvent._itself_.vmdeath001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VMDeathEvent._itself_.vmdeath001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002.java
index 292df10b3e4..1fa254e7d4a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -70,7 +70,9 @@ public class vmdeath002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002/TestDescription.java
index 48a49367193..b7bdea42722 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -80,7 +80,7 @@
* /test/lib
* @build nsk.jdi.VMDeathEvent._itself_.vmdeath002
* nsk.jdi.VMDeathEvent._itself_.vmdeath002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VMDeathEvent._itself_.vmdeath002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003.java
index 146f207bdc5..c7d7a5557c8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -76,7 +76,9 @@ public class vmdeath003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003/TestDescription.java
index 7126613deb2..0ac50c96742 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -79,7 +79,7 @@
* /test/lib
* @build nsk.jdi.VMDeathEvent._itself_.vmdeath003
* nsk.jdi.VMDeathEvent._itself_.vmdeath003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VMDeathEvent._itself_.vmdeath003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect001.java
index e12ec008d92..4bb0dc09ae8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -55,8 +55,11 @@ public class disconnect001 {
static private boolean testFailed;
static private boolean eventReceived;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect001/TestDescription.java
index 5024fc4a09f..59b7d768f64 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.VMDisconnectEvent._itself_.disconnect001
* nsk.jdi.VMDisconnectEvent._itself_.disconnect001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VMDisconnectEvent._itself_.disconnect001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect002.java
index 195d54dde97..ba63c17f71f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -55,8 +55,11 @@ public class disconnect002 {
static private boolean testFailed;
static private boolean eventReceived;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect002/TestDescription.java
index ed15a46853a..a44af7ffaea 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.VMDisconnectEvent._itself_.disconnect002
* nsk.jdi.VMDisconnectEvent._itself_.disconnect002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VMDisconnectEvent._itself_.disconnect002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect003.java
index f4e120bf250..186afd590a1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -55,8 +55,11 @@ public class disconnect003 {
static private boolean testFailed;
static private boolean eventReceived;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect003/TestDescription.java
index c53345a8adb..8e43fcf488d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.VMDisconnectEvent._itself_.disconnect003
* nsk.jdi.VMDisconnectEvent._itself_.disconnect003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VMDisconnectEvent._itself_.disconnect003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java
index b5c7c748a35..079c81cbdc2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -39,7 +39,7 @@
* /test/lib
* @build nsk.jdi.VMOutOfMemoryException.VMOutOfMemoryException001.VMOutOfMemoryException001
* nsk.jdi.VMOutOfMemoryException.VMOutOfMemoryException001.VMOutOfMemoryException001t
- * @run main/othervm
+ * @run driver
* nsk.jdi.VMOutOfMemoryException.VMOutOfMemoryException001.VMOutOfMemoryException001
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -59,7 +59,10 @@ import nsk.share.jdi.*;
public class VMOutOfMemoryException001 extends TestDebuggerType2 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001.java
index 00abeadbe04..58a2f7f3562 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -59,8 +59,11 @@ public class thread001 {
static private boolean testFailed;
static private boolean eventReceived;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001/TestDescription.java
index 29c9808fdb4..03b01ee19d0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.VMStartEvent.thread.thread001
* nsk.jdi.VMStartEvent.thread.thread001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VMStartEvent.thread.thread001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001.java
index 22a70e3e047..b02ce0515b2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -69,7 +69,9 @@ public class value001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001/TestDescription.java
index ac9a80fde78..a602933b861 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* @clean nsk.jdi.Value._itself_.value001a
* @compile -g:lines,source,vars ../value001a.java
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.Value._itself_.value001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type001.java
index d18f487e347..7332e0a4dec 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -90,7 +90,9 @@ public class type001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type001/TestDescription.java
index 588499e9082..ab4875dd59c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.Value.type.type001
* nsk.jdi.Value.type.type001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Value.type.type001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.java
index 85a015e788b..af2fd9d780d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.Value.type.type002.type002
* nsk.jdi.Value.type.type002.type002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Value.type.type002.type002
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -119,7 +119,9 @@ public class type002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type003.java
index e75d8edbda3..5a54fd36221 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -83,7 +83,9 @@ public class type003 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type003/TestDescription.java
index 31cee6b35b6..b868b2cde00 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.Value.type.type003
* nsk.jdi.Value.type.type003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.Value.type.type003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001.java
index 0d7e734c7cc..44477e156f9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -71,7 +71,9 @@ public class allclasses001 extends JDIBase {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001/TestDescription.java
index c2a59119e89..a8166c6a45a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.allClasses.allclasses001
* nsk.jdi.VirtualMachine.allClasses.allclasses001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.allClasses.allclasses001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses002.java
index f60e48535e6..1474df1a82b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -61,7 +61,9 @@ public class allclasses002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses002/TestDescription.java
index 8307a535dbb..450e7f0726e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -65,7 +65,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.allClasses.allclasses002
* nsk.jdi.VirtualMachine.allClasses.allclasses002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.allClasses.allclasses002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001.java
index b83ee9ef2d2..98496bb957c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class allthreads001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001/TestDescription.java
index a7148250f7d..0156e863a31 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.allThreads.allthreads001
* nsk.jdi.VirtualMachine.allThreads.allthreads001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.allThreads.allthreads001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001.java
index ea2fa8462ac..f0eea0731c0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class canaddmethod001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001/TestDescription.java
index e8a64b156ee..9636d74cb57 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.canAddMethod.canaddmethod001
* nsk.jdi.VirtualMachine.canAddMethod.canaddmethod001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.canAddMethod.canaddmethod001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001.java
index 5e2386f33eb..ca45cfd424f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -54,7 +54,10 @@ public class canbemodified001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001/TestDescription.java
index a0af22093b1..c5567b75f3c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -41,7 +41,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.canBeModified.canbemodified001
* nsk.jdi.VirtualMachine.canBeModified.canbemodified001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.canBeModified.canbemodified001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetBytecodes/cangetbytecodes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetBytecodes/cangetbytecodes001.java
index 136a7bc6a9c..d3b0ff2bb39 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetBytecodes/cangetbytecodes001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetBytecodes/cangetbytecodes001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -71,7 +71,9 @@ public class cangetbytecodes001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetBytecodes/cangetbytecodes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetBytecodes/cangetbytecodes001/TestDescription.java
index 9aaa5700f57..38c7d7cb384 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetBytecodes/cangetbytecodes001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetBytecodes/cangetbytecodes001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.canGetBytecodes.cangetbytecodes001
* nsk.jdi.VirtualMachine.canGetBytecodes.cangetbytecodes001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.canGetBytecodes.cangetbytecodes001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001.java
index ba7adb4306d..a9e56f30b3a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,7 +77,9 @@ public class cangccm001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001/TestDescription.java
index 9efcc08e94b..c8720f9b0af 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.canGetCurrentContendedMonitor.cangccm001
* nsk.jdi.VirtualMachine.canGetCurrentContendedMonitor.cangccm001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.canGetCurrentContendedMonitor.cangccm001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001.java
index e6df399d448..cc550ba50b2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class cangetmonitorinfo001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001/TestDescription.java
index ea31019201c..eecd47c1e82 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.canGetMonitorInfo.cangetmonitorinfo001
* nsk.jdi.VirtualMachine.canGetMonitorInfo.cangetmonitorinfo001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.canGetMonitorInfo.cangetmonitorinfo001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001.java
index 36d09e2c1c4..08aa1cbd3a6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,7 +77,9 @@ public class cangetinfo001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001/TestDescription.java
index 1d26e35dce3..78bb8070645 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.canGetOwnedMonitorInfo.cangetinfo001
* nsk.jdi.VirtualMachine.canGetOwnedMonitorInfo.cangetinfo001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.canGetOwnedMonitorInfo.cangetinfo001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSourceDebugExtension/cangetsde001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSourceDebugExtension/cangetsde001.java
index 3409b9f4a57..0e3f7c437a4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSourceDebugExtension/cangetsde001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSourceDebugExtension/cangetsde001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -61,7 +61,9 @@ public class cangetsde001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSourceDebugExtension/cangetsde001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSourceDebugExtension/cangetsde001/TestDescription.java
index b8fba65dbce..5f639617130 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSourceDebugExtension/cangetsde001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSourceDebugExtension/cangetsde001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.canGetSourceDebugExtension.cangetsde001
* nsk.jdi.VirtualMachine.canGetSourceDebugExtension.cangetsde001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.canGetSourceDebugExtension.cangetsde001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSyntheticAttribute/cangetattr001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSyntheticAttribute/cangetattr001.java
index 0b9d413e64b..a7fa72d4fbc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSyntheticAttribute/cangetattr001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSyntheticAttribute/cangetattr001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -71,7 +71,9 @@ public class cangetattr001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSyntheticAttribute/cangetattr001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSyntheticAttribute/cangetattr001/TestDescription.java
index 71f83caf0a7..73489ce88ce 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSyntheticAttribute/cangetattr001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSyntheticAttribute/cangetattr001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.canGetSyntheticAttribute.cangetattr001
* nsk.jdi.VirtualMachine.canGetSyntheticAttribute.cangetattr001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.canGetSyntheticAttribute.cangetattr001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001.java
index c16772d3ea3..03f38b66f1f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class canpopframes001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001/TestDescription.java
index 3fabe495a4e..aace3805cd9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.canPopFrames.canpopframes001
* nsk.jdi.VirtualMachine.canPopFrames.canpopframes001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.canPopFrames.canpopframes001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001.java
index 73a501bfc60..88e54ac79a4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class canredefineclasses001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001/TestDescription.java
index 46301fa9658..adaff91f300 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.canRedefineClasses.canredefineclasses001
* nsk.jdi.VirtualMachine.canRedefineClasses.canredefineclasses001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.canRedefineClasses.canredefineclasses001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001.java
index 20c1b88e751..8d057c809cb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class canreqvmdev001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001/TestDescription.java
index 2c696e60394..9e0c35afaf5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.canRequestVMDeathEvent.canreqvmdev001
* nsk.jdi.VirtualMachine.canRequestVMDeathEvent.canreqvmdev001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.canRequestVMDeathEvent.canreqvmdev001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001.java
index 950f13ca2ff..62d44d8c7bb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class curc001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001/TestDescription.java
index e340480d525..2465d72f9fa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.canUnrestrictedlyRedefineClasses.curc001
* nsk.jdi.VirtualMachine.canUnrestrictedlyRedefineClasses.curc001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.canUnrestrictedlyRedefineClasses.curc001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001.java
index ea8c4f55f67..c03cef0d05c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -66,7 +66,9 @@ public class canusefilters001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001/TestDescription.java
index 2fa6bf90576..f08920ed8de 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.canUseInstanceFilters.canusefilters001
* nsk.jdi.VirtualMachine.canUseInstanceFilters.canusefilters001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.canUseInstanceFilters.canusefilters001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001.java
index a168056f423..466c2c6ed78 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,7 +77,9 @@ public class canwatchaccess001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001/TestDescription.java
index b094912cc21..8aa80de91a1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.canWatchFieldAccess.canwatchaccess001
* nsk.jdi.VirtualMachine.canWatchFieldAccess.canwatchaccess001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.canWatchFieldAccess.canwatchaccess001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001.java
index a543024cea9..b64d346994d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -78,7 +78,9 @@ public class canwatchmod001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001/TestDescription.java
index 54a210c2199..0c1a28f3031 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.canWatchFieldModification.canwatchmod001
* nsk.jdi.VirtualMachine.canWatchFieldModification.canwatchmod001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.canWatchFieldModification.canwatchmod001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/classesByName/classesbyname001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/classesByName/classesbyname001.java
index 7f5416d3908..da26eb37857 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/classesByName/classesbyname001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/classesByName/classesbyname001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -74,7 +74,9 @@ public class classesbyname001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/classesByName/classesbyname001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/classesByName/classesbyname001/TestDescription.java
index 6ecca18722b..93b28f0daf1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/classesByName/classesbyname001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/classesByName/classesbyname001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.classesByName.classesbyname001
* nsk.jdi.VirtualMachine.classesByName.classesbyname001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.classesByName.classesbyname001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/description/description001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/description/description001.java
index f64a028a2ee..dbb073d7c65 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/description/description001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/description/description001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -57,7 +57,9 @@ public class description001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/description/description001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/description/description001/TestDescription.java
index b77f21cad43..a161dfd732a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/description/description001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/description/description001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.description.description001
* nsk.jdi.VirtualMachine.description.description001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.description.description001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose001.java
index cfb22e400ac..e7443f7127b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,9 @@ public class dispose001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose001/TestDescription.java
index 20b19fdbb95..49f776d0225 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.dispose.dispose001
* nsk.jdi.VirtualMachine.dispose.dispose001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.dispose.dispose001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002.java
index 7f745cad44f..6e29432692c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -74,7 +74,9 @@ public class dispose002 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002/TestDescription.java
index 8ee571a11ff..710dd34481a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.dispose.dispose002
* nsk.jdi.VirtualMachine.dispose.dispose002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.dispose.dispose002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003.java
index 06a06961877..41e5d6c87ec 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -70,7 +70,9 @@ public class dispose003 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003/TestDescription.java
index e9738d2a7b8..ec364648be9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.dispose.dispose003
* nsk.jdi.VirtualMachine.dispose.dispose003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.dispose.dispose003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004.java
index 5a4a3cf8c0b..14a6468c41c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -71,7 +71,9 @@ public class dispose004 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004/TestDescription.java
index 957d9426b6b..7e933e46b21 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.dispose.dispose004
* nsk.jdi.VirtualMachine.dispose.dispose004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.dispose.dispose004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005.java
index ed4dfd1a815..874ff2c9406 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -108,7 +108,9 @@ public class dispose005 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005/TestDescription.java
index fad793f5ce2..0cfe42c44c4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -75,7 +75,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.dispose.dispose005
* nsk.jdi.VirtualMachine.dispose.dispose005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.dispose.dispose005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventQueue/eventqueue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventQueue/eventqueue001.java
index 7ad965372d1..2cdc605adc6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventQueue/eventqueue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventQueue/eventqueue001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -65,7 +65,9 @@ public class eventqueue001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventQueue/eventqueue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventQueue/eventqueue001/TestDescription.java
index 7d8010ced2b..4418520b7b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventQueue/eventqueue001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventQueue/eventqueue001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.eventQueue.eventqueue001
* nsk.jdi.VirtualMachine.eventQueue.eventqueue001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.eventQueue.eventqueue001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventRequestManager/eventrmanager001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventRequestManager/eventrmanager001.java
index 804485f3c7b..ccadfefdba6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventRequestManager/eventrmanager001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventRequestManager/eventrmanager001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -65,7 +65,9 @@ public class eventrmanager001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventRequestManager/eventrmanager001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventRequestManager/eventrmanager001/TestDescription.java
index 0f7360c3c2b..33c8bb303b2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventRequestManager/eventrmanager001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventRequestManager/eventrmanager001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.eventRequestManager.eventrmanager001
* nsk.jdi.VirtualMachine.eventRequestManager.eventrmanager001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.eventRequestManager.eventrmanager001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit001.java
index 95309fa0284..2f55319943a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -65,7 +65,9 @@ public class exit001 {
public static void main(String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit001/TestDescription.java
index 1cdf827c5b4..fce23f90218 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.exit.exit001
* nsk.jdi.VirtualMachine.exit.exit001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.exit.exit001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit002.java
index f848ad89afe..9cf1d0e0eac 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -64,7 +64,9 @@ public class exit002 {
public static void main(String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit002/TestDescription.java
index 217c6c410b2..cc9a07f68c6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.exit.exit002
* nsk.jdi.VirtualMachine.exit.exit002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.exit.exit002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/getDefaultStratum/getdefaultstratum001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/getDefaultStratum/getdefaultstratum001.java
index d13cf01f8e3..fd1cd6db2d5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/getDefaultStratum/getdefaultstratum001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/getDefaultStratum/getdefaultstratum001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -64,7 +64,9 @@ public class getdefaultstratum001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/getDefaultStratum/getdefaultstratum001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/getDefaultStratum/getdefaultstratum001/TestDescription.java
index 621493837b6..9202bc3a718 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/getDefaultStratum/getdefaultstratum001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/getDefaultStratum/getdefaultstratum001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.getDefaultStratum.getdefaultstratum001
* nsk.jdi.VirtualMachine.getDefaultStratum.getdefaultstratum001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.getDefaultStratum.getdefaultstratum001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts001/instancecounts001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts001/instancecounts001.java
index 5f67dfaa363..e1a885b4d18 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts001/instancecounts001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts001/instancecounts001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -71,7 +71,10 @@ public class instancecounts001 extends HeapwalkingDebugger {
private boolean forceGC;
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java
index 98d9e04e1c4..f2150775916 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -48,7 +48,7 @@
* @build nsk.jdi.VirtualMachine.instanceCounts.instancecounts003.instancecounts003
* nsk.share.jdi.TestClass1
* nsk.share.jdi.TestInterfaceImplementer1
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.instanceCounts.instancecounts003.instancecounts003
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -69,7 +69,10 @@ import nsk.share.jpda.AbstractDebuggeeTest;
public class instancecounts003 extends HeapwalkingDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts004/instancecounts004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts004/instancecounts004.java
index 256d7ce1e06..bb25c1e6fb7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts004/instancecounts004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts004/instancecounts004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -41,7 +41,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.instanceCounts.instancecounts004.instancecounts004
* nsk.jdi.VirtualMachine.instanceCounts.instancecounts004.instancecounts004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.instanceCounts.instancecounts004.instancecounts004
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -70,7 +70,10 @@ public class instancecounts004 extends HeapwalkingDebugger {
private int methodCallCount = 10;
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_bool/mirrorof_bool001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_bool/mirrorof_bool001.java
index b306513f70f..3aa3f454f3d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_bool/mirrorof_bool001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_bool/mirrorof_bool001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -84,7 +84,9 @@ public class mirrorof_bool001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_bool/mirrorof_bool001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_bool/mirrorof_bool001/TestDescription.java
index 8af423280a4..e5a18d18640 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_bool/mirrorof_bool001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_bool/mirrorof_bool001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.mirrorOf_bool.mirrorof_bool001
* nsk.jdi.VirtualMachine.mirrorOf_bool.mirrorof_bool001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.mirrorOf_bool.mirrorof_bool001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_byte/mirrorof_byte001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_byte/mirrorof_byte001.java
index 9d67e039459..1b73bfb997f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_byte/mirrorof_byte001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_byte/mirrorof_byte001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -85,7 +85,9 @@ public class mirrorof_byte001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_byte/mirrorof_byte001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_byte/mirrorof_byte001/TestDescription.java
index 07dd68d5ca7..311f25ee655 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_byte/mirrorof_byte001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_byte/mirrorof_byte001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.mirrorOf_byte.mirrorof_byte001
* nsk.jdi.VirtualMachine.mirrorOf_byte.mirrorof_byte001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.mirrorOf_byte.mirrorof_byte001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_char/mirrorof_char001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_char/mirrorof_char001.java
index 453574ea8f6..f184a9cab76 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_char/mirrorof_char001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_char/mirrorof_char001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -85,7 +85,9 @@ public class mirrorof_char001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_char/mirrorof_char001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_char/mirrorof_char001/TestDescription.java
index ad372bf5724..da2ee9e3943 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_char/mirrorof_char001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_char/mirrorof_char001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.mirrorOf_char.mirrorof_char001
* nsk.jdi.VirtualMachine.mirrorOf_char.mirrorof_char001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.mirrorOf_char.mirrorof_char001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_double/mirrorof_double001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_double/mirrorof_double001.java
index 545707bee47..27fd80fe21d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_double/mirrorof_double001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_double/mirrorof_double001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -89,7 +89,9 @@ public class mirrorof_double001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_double/mirrorof_double001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_double/mirrorof_double001/TestDescription.java
index 805b185d38b..515e8c7ad6a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_double/mirrorof_double001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_double/mirrorof_double001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.mirrorOf_double.mirrorof_double001
* nsk.jdi.VirtualMachine.mirrorOf_double.mirrorof_double001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.mirrorOf_double.mirrorof_double001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_float/mirrorof_float001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_float/mirrorof_float001.java
index 39c7b06e69d..d80246e0e39 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_float/mirrorof_float001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_float/mirrorof_float001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -89,7 +89,9 @@ public class mirrorof_float001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_float/mirrorof_float001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_float/mirrorof_float001/TestDescription.java
index a936dfd632d..4f7f7eaf6b3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_float/mirrorof_float001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_float/mirrorof_float001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.mirrorOf_float.mirrorof_float001
* nsk.jdi.VirtualMachine.mirrorOf_float.mirrorof_float001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.mirrorOf_float.mirrorof_float001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_int/mirrorof_int001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_int/mirrorof_int001.java
index 4f8f170a872..fef0615cc39 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_int/mirrorof_int001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_int/mirrorof_int001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -85,7 +85,9 @@ public class mirrorof_int001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_int/mirrorof_int001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_int/mirrorof_int001/TestDescription.java
index 8ccff3f2b27..5713e67da5f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_int/mirrorof_int001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_int/mirrorof_int001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.mirrorOf_int.mirrorof_int001
* nsk.jdi.VirtualMachine.mirrorOf_int.mirrorof_int001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.mirrorOf_int.mirrorof_int001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_long/mirrorof_long001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_long/mirrorof_long001.java
index 13579157486..d40a62a86e5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_long/mirrorof_long001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_long/mirrorof_long001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -85,7 +85,9 @@ public class mirrorof_long001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_long/mirrorof_long001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_long/mirrorof_long001/TestDescription.java
index abe82f0d5d6..606b375ebfd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_long/mirrorof_long001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_long/mirrorof_long001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.mirrorOf_long.mirrorof_long001
* nsk.jdi.VirtualMachine.mirrorOf_long.mirrorof_long001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.mirrorOf_long.mirrorof_long001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_short/mirrorof_short001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_short/mirrorof_short001.java
index f876bdcad69..099b81f49c0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_short/mirrorof_short001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_short/mirrorof_short001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -85,7 +85,9 @@ public class mirrorof_short001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_short/mirrorof_short001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_short/mirrorof_short001/TestDescription.java
index 3af905f9aa2..d8625b55dfb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_short/mirrorof_short001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_short/mirrorof_short001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.mirrorOf_short.mirrorof_short001
* nsk.jdi.VirtualMachine.mirrorOf_short.mirrorof_short001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.mirrorOf_short.mirrorof_short001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_string/mirrorof_string001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_string/mirrorof_string001.java
index e2bf3090e43..c2025f6457e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_string/mirrorof_string001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_string/mirrorof_string001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -66,7 +66,9 @@ public class mirrorof_string001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_string/mirrorof_string001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_string/mirrorof_string001/TestDescription.java
index ec8e9a6fa9a..5c7a737e33d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_string/mirrorof_string001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_string/mirrorof_string001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.mirrorOf_string.mirrorof_string001
* nsk.jdi.VirtualMachine.mirrorOf_string.mirrorof_string001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.mirrorOf_string.mirrorof_string001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/name/name001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/name/name001.java
index ba373bd76db..109103f83c5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/name/name001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/name/name001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -57,7 +57,9 @@ public class name001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/name/name001/TestDescription.java
index 1395db72e4d..03a8d440714 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/name/name001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/name/name001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.name.name001
* nsk.jdi.VirtualMachine.name.name001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.name.name001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/process/process001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/process/process001.java
index 1e9efa792b0..189be100425 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/process/process001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/process/process001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -61,7 +61,9 @@ public class process001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/process/process001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/process/process001/TestDescription.java
index 7dd5fc60611..fc9dfc32535 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/process/process001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/process/process001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.process.process001
* nsk.jdi.VirtualMachine.process.process001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.process.process001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001.java
index 30b39ac78f6..5db62c170de 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -100,7 +100,9 @@ public class redefineclasses001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001/TestDescription.java
index a518ea291a1..031ad00325b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -125,7 +125,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses001
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses002.java
index 7182fa752ef..18fe8c79adc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -105,7 +105,10 @@ public class redefineclasses002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses002/TestDescription.java
index 325dffd802b..7c35a44061e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -76,7 +76,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses002
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses003.java
index dc3e5458dec..585c71207e9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -94,7 +94,10 @@ public class redefineclasses003 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses003/TestDescription.java
index a4ed80f2df7..8272276a37c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -66,7 +66,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses003
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004.java
index 97987dc2e8e..cbccac467e7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -110,7 +110,10 @@ public class redefineclasses004 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004/TestDescription.java
index 9a4b945d1fd..3bce2d75f60 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* -g:lines,source,vars
* newclass01 newclass02 newclass03 newclass04 newclass05 newclass06 newclass07 newclass08 newclass09 newclass10
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses004
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005.java
index c70a620b39e..92e1a4617c8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -99,7 +99,10 @@ public class redefineclasses005 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005/TestDescription.java
index c599af8eef9..64f0aa9a189 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* -g:lines,source,vars
* newclass01 newclass02 newclass03 newclass04
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses005
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006.java
index de6ff8afc22..c12295948a0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -101,7 +101,10 @@ public class redefineclasses006 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006/TestDescription.java
index eec6af71164..1d546ab3c6f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* -g:lines,source,vars
* newclass01 newclass02 newclass03 newclass04
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses006
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007.java
index 5bcd5337710..cafe5e05c35 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -108,7 +108,10 @@ public class redefineclasses007 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007/TestDescription.java
index fc7a300210b..13083b806dd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* -g:lines,source,vars
* newclass01 newclass02 newclass03 newclass04 newclass05 newclass06
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses007
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008.java
index 5b187eda0aa..5ebc7d5442f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -106,7 +106,10 @@ public class redefineclasses008 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008/TestDescription.java
index faa7d667446..8642c78f7da 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* -g:lines,source,vars
* newclass01 newclass02 newclass03 newclass04 newclass05 newclass06
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses008
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009.java
index 17bdee16578..38e0093570c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -98,7 +98,10 @@ public class redefineclasses009 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009/TestDescription.java
index 362d3e6892f..24395c5600c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* -g:lines,source,vars
* newclass01 newclass02 newclass03
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses009
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010.java
index 740e38485fc..8d6fc4ac3c4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -100,7 +100,10 @@ public class redefineclasses010 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010/TestDescription.java
index 37ad860f379..e2498e20048 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* -g:lines,source,vars
* newclass01 newclass02 newclass03 newclass04
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses010
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011.java
index 28d9a53f272..573c60f5cb3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -102,7 +102,10 @@ public class redefineclasses011 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011/TestDescription.java
index 5b05ebc68fb..d4986bbc244 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -76,7 +76,7 @@
* -g:lines,source,vars
* newclass01 newclass02 newclass03 newclass04
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses011
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012.java
index b5490cbbfd7..23aac498c87 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -103,7 +103,10 @@ public class redefineclasses012 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012/TestDescription.java
index 46ead6fd5d9..05c1f459041 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* -g:lines,source,vars
* newclass01 newclass02
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses012
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013.java
index beb100e86d3..e0b344e51a0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -103,7 +103,10 @@ public class redefineclasses013 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013/TestDescription.java
index a2b1975f535..26cdb49bb3b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* -g:lines,source,vars
* newclass01 newclass02 newclass03
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses013
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014.java
index 7f5e2ec4c57..b664992fcc3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -104,7 +104,10 @@ public class redefineclasses014 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014/TestDescription.java
index 0f84d4ec210..880af11c27a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* -g:lines,source,vars
* newclass01 newclass02 newclass03
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses014
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015.java
index 9c1596b5e52..083ceabc71d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -124,7 +124,10 @@ public class redefineclasses015 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015/TestDescription.java
index 4558fc09f59..f1bd996b63f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -81,7 +81,7 @@
* -g:lines,source,vars
* newclass01 newclass02 newclass03 newclass04 newclass05 newclass06 newclass07 newclass08
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses015
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016.java
index caf6ec689e8..10ab031738b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -112,7 +112,10 @@ public class redefineclasses016 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016/TestDescription.java
index c913540a507..9a02fdf36ad 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* -g:lines,source,vars
* newclass01 newclass02 newclass03 newclass04 newclass05 newclass06
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses016
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020.java
index a4f0eefbe2a..2d722a65bce 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -100,7 +100,10 @@ public class redefineclasses020 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020/TestDescription.java
index 9f756855def..259d5695e6c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -58,7 +58,7 @@
* -g:lines,source,vars
* newclass01 newclass02 newclass03 newclass04
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses020
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021.java
index 33789a3869d..540573bf071 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -98,7 +98,10 @@ public class redefineclasses021 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java
index 37f36a06f35..9296fb59704 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* with full debug info
* @run driver nsk.share.ExtraClassesBuilder -g:lines,source,vars newclass01 newclass02
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses021
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022.java
index 4204945ac81..f703383d024 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -98,7 +98,10 @@ public class redefineclasses022 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022/TestDescription.java
index 47c14cfe584..ed80cf249e0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -57,7 +57,7 @@
* -g:lines,source,vars
* newclass01 newclass02 newclass03
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses022
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024.java
index 0e501d701fb..2c9c861908e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -105,7 +105,10 @@ public class redefineclasses024 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024/TestDescription.java
index 12acf21b700..e16b16221f1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* -g:lines,source,vars
* newclass01 newclass02 newclass03 newclass04
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses024
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025.java
index ab78dc5d1a4..dc3d8ff896f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -97,7 +97,10 @@ public class redefineclasses025 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025/TestDescription.java
index a43707d0fea..f8c751f56dc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* -g:lines,source,vars
* newclass01 newclass02
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses025
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026.java
index 3eee2a7b9ae..9b391ac4459 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -87,7 +87,10 @@ public class redefineclasses026 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026/TestDescription.java
index 5280b6d70e3..b157115950d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -56,7 +56,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses026
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027.java
index 654ec5bd5f1..6dc6ef4704f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -87,7 +87,10 @@ public class redefineclasses027 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027/TestDescription.java
index 05f0233488b..e215e8bcb6f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses027
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses027a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses027
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028.java
index 7b9e39c7d4d..b22368d6b39 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -87,7 +87,10 @@ public class redefineclasses028 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028/TestDescription.java
index 3be96b013c9..da4c297c3e5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -50,7 +50,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses028
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses028a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses028
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses029.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses029.java
index 469d2d5304d..f476c23621c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses029.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses029.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -75,7 +75,10 @@ public class redefineclasses029 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses029/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses029/TestDescription.java
index ca42be699a5..5e4dabd9060 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses029/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses029/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -46,7 +46,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses029
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses029a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses029
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030.java
index efa6ba4db79..3c7a028b5a8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -97,7 +97,10 @@ public class redefineclasses030 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030/TestDescription.java
index 87e041df41c..c12958fafe6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses030
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses030a
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses030
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031.java
index 7a98229d5ad..d0f65a08d70 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -89,7 +89,10 @@ public class redefineclasses031 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031/TestDescription.java
index 35a213c611c..d196e27aa60 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* -g:lines,source,vars
* newclass01 newclass02 newclass03 newclass04 newclass05
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses031
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032.java
index b5401270162..d36ce86835f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -74,7 +74,10 @@ public class redefineclasses032 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032/TestDescription.java
index 2b32e1751d5..b32bff407d4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses032
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses034.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses034.java
index 8651738aeef..4747d90f514 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses034.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses034.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -94,7 +94,10 @@ public class redefineclasses034 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses034/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses034/TestDescription.java
index 5869e2f2db7..3b87a6dcc91 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses034/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses034/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses034
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses035.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses035.java
index ca7b7c167c3..14227d26d40 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses035.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses035.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -98,7 +98,10 @@ public class redefineclasses035 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses035/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses035/TestDescription.java
index 225df7f26eb..476655816fa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses035/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses035/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* -g:lines,source,vars
* newclass
*
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses035
* ./bin
* -verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/resume/resume001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/resume/resume001.java
index db12a441e96..1ce721be4e0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/resume/resume001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/resume/resume001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -32,7 +32,10 @@ import com.sun.jdi.request.*;
public class resume001 extends TestDebuggerType2 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/resume/resume001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/resume/resume001/TestDescription.java
index 79e441f0c9c..12d1e80d501 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/resume/resume001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/resume/resume001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -43,7 +43,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.resume.resume001
* nsk.jdi.VirtualMachine.resume.resume001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.resume.resume001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum002/setDefaultStratum002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum002/setDefaultStratum002.java
index 0ee0ca30a5e..ea9c834bdb9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum002/setDefaultStratum002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum002/setDefaultStratum002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -71,7 +71,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.VirtualMachine.setDefaultStratum.setDefaultStratum002.setDefaultStratum002
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.setDefaultStratum.setDefaultStratum002.setDefaultStratum002
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -94,7 +94,10 @@ import nsk.share.jdi.sde.*;
public class setDefaultStratum002 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum003/setDefaultStratum003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum003/setDefaultStratum003.java
index d6053006e13..b90f926e898 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum003/setDefaultStratum003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum003/setDefaultStratum003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -58,7 +58,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.VirtualMachine.setDefaultStratum.setDefaultStratum003.setDefaultStratum003
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.setDefaultStratum.setDefaultStratum003.setDefaultStratum003
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -82,7 +82,10 @@ import nsk.share.jdi.sde.*;
public class setDefaultStratum003 extends SDEDebugger {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setdefaultstratum001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setdefaultstratum001.java
index 3bb646db69d..090157381d3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setdefaultstratum001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setdefaultstratum001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -64,7 +64,9 @@ public class setdefaultstratum001 {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setdefaultstratum001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setdefaultstratum001/TestDescription.java
index c1454186563..0084dcc6b02 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setdefaultstratum001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setdefaultstratum001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.setDefaultStratum.setdefaultstratum001
* nsk.jdi.VirtualMachine.setDefaultStratum.setdefaultstratum001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.setDefaultStratum.setdefaultstratum001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001.java
index 901b10a4878..b50b1d883ff 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,7 +79,9 @@ public class suspend001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001/TestDescription.java
index f02c6e944b9..fee498ecc2c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.suspend.suspend001
* nsk.jdi.VirtualMachine.suspend.suspend001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.suspend.suspend001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/topLevelThreadGroups/toplevelgroups001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/topLevelThreadGroups/toplevelgroups001.java
index 25abf9badc8..e6f6da394e5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/topLevelThreadGroups/toplevelgroups001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/topLevelThreadGroups/toplevelgroups001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -61,7 +61,9 @@ public class toplevelgroups001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/topLevelThreadGroups/toplevelgroups001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/topLevelThreadGroups/toplevelgroups001/TestDescription.java
index 4e8cf9bdd4a..98a295aed63 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/topLevelThreadGroups/toplevelgroups001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/topLevelThreadGroups/toplevelgroups001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.topLevelThreadGroups.toplevelgroups001
* nsk.jdi.VirtualMachine.topLevelThreadGroups.toplevelgroups001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.topLevelThreadGroups.toplevelgroups001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/version/version001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/version/version001.java
index 55553e64857..49ffd7d66b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/version/version001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/version/version001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -57,7 +57,9 @@ public class version001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/version/version001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/version/version001/TestDescription.java
index 5b27b8a49e1..e56ea464915 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/version/version001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/version/version001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,7 +61,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachine.version.version001
* nsk.jdi.VirtualMachine.version.version001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachine.version.version001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/allConnectors/allconnectors001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/allConnectors/allconnectors001.java
index e4e62126431..c717ab5fa87 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/allConnectors/allconnectors001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/allConnectors/allconnectors001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -63,7 +63,9 @@ public class allconnectors001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/allConnectors/allconnectors001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/allConnectors/allconnectors001/TestDescription.java
index 9a38909b74d..7aad5ca9b92 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/allConnectors/allconnectors001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/allConnectors/allconnectors001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -46,7 +46,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.VirtualMachineManager.allConnectors.allconnectors001
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachineManager.allConnectors.allconnectors001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/attachingConnectors/attaching001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/attachingConnectors/attaching001.java
index e2c03af18c2..5229fc4a5c6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/attachingConnectors/attaching001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/attachingConnectors/attaching001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -62,7 +62,9 @@ public class attaching001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/attachingConnectors/attaching001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/attachingConnectors/attaching001/TestDescription.java
index 4f1524a3bb0..c4bd3c3f764 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/attachingConnectors/attaching001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/attachingConnectors/attaching001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.VirtualMachineManager.attachingConnectors.attaching001
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachineManager.attachingConnectors.attaching001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm001.java
index 82e71b3796b..eb3091daf43 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -72,7 +72,9 @@ public class convm001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm001/TestDescription.java
index cc48dc008b8..c1fc78f3849 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachineManager.connectedVirtualMachines.convm001
* nsk.jdi.VirtualMachineManager.connectedVirtualMachines.convm001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachineManager.connectedVirtualMachines.convm001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm002.java
index 5ba9cb19f53..ac5038146dc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -70,7 +70,9 @@ public class convm002 {
public static void main(String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm002/TestDescription.java
index e4c672cbcd8..2ee851d75fa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachineManager.connectedVirtualMachines.convm002
* nsk.jdi.VirtualMachineManager.connectedVirtualMachines.convm002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachineManager.connectedVirtualMachines.convm002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm003.java
index ca4700b54c0..cb7c8bd4137 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -71,7 +71,9 @@ public class convm003 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm003/TestDescription.java
index 7b4c2a770bb..8b72ea15350 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachineManager.connectedVirtualMachines.convm003
* nsk.jdi.VirtualMachineManager.connectedVirtualMachines.convm003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachineManager.connectedVirtualMachines.convm003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001.java
index 4a30f01fe58..5b0363f9dd4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -71,8 +71,10 @@ public class createVM001 {
}
public static void main (String argv[]) {
- int result = run(argv, System.out);
- System.exit(result + STATUS_TEMP);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001/TestDescription.java
index 5af48490429..235b7710f3b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -42,7 +42,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.VirtualMachineManager.createVirtualMachine.createVM001
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachineManager.createVirtualMachine.createVM001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002.java
index efe4f6fac92..eb43ca30b59 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -73,8 +73,10 @@ public class createVM002 {
}
public static void main (String argv[]) {
- int result = run(argv, System.out);
- System.exit(result + STATUS_TEMP);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002/TestDescription.java
index f96d7d86b15..3ab191b519e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -44,7 +44,7 @@
* /test/lib
* @build nsk.jdi.VirtualMachineManager.createVirtualMachine.createVM002
* nsk.jdi.VirtualMachineManager.createVirtualMachine.CreateVM002_TargetVM
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachineManager.createVirtualMachine.createVM002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003.java
index 5df26b6ab37..00a35be2102 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -78,8 +78,10 @@ public class createVM003 {
}
public static void main (String argv[]) {
- int result = run(argv, System.out);
- System.exit(result + STATUS_TEMP);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004.java
index 4673ad23fcc..07aa33e6ec6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -78,8 +78,10 @@ public class createVM004 {
}
public static void main (String argv[]) {
- int result = run(argv, System.out);
- System.exit(result + STATUS_TEMP);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005.java
index e7a4e15f93c..1ec79a02d9e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -77,8 +77,10 @@ public class createVM005 {
}
public static void main (String argv[]) {
- int result = run(argv, System.out);
- System.exit(result + STATUS_TEMP);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/defaultConnector/default001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/defaultConnector/default001.java
index 6a230db6877..69456fa5478 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/defaultConnector/default001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/defaultConnector/default001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -63,7 +63,9 @@ public class default001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/defaultConnector/default001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/defaultConnector/default001/TestDescription.java
index b1feb8ff05c..2672f2888df 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/defaultConnector/default001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/defaultConnector/default001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.VirtualMachineManager.defaultConnector.default001
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachineManager.defaultConnector.default001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/launchingConnectors/launching001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/launchingConnectors/launching001.java
index fdd198189e5..feb8f1d4089 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/launchingConnectors/launching001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/launchingConnectors/launching001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -63,7 +63,9 @@ public class launching001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/launchingConnectors/launching001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/launchingConnectors/launching001/TestDescription.java
index c062a4668f3..70e85ce4535 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/launchingConnectors/launching001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/launchingConnectors/launching001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.VirtualMachineManager.launchingConnectors.launching001
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachineManager.launchingConnectors.launching001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/listeningConnectors/listening001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/listeningConnectors/listening001.java
index 4e7e4009a68..39067412896 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/listeningConnectors/listening001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/listeningConnectors/listening001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -63,7 +63,9 @@ public class listening001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/listeningConnectors/listening001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/listeningConnectors/listening001/TestDescription.java
index 6cd688b85c2..2533be5d2f0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/listeningConnectors/listening001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/listeningConnectors/listening001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.VirtualMachineManager.listeningConnectors.listening001
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachineManager.listeningConnectors.listening001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/majorInterfaceVersion/major001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/majorInterfaceVersion/major001.java
index dd11ba4d854..43ef0c99aac 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/majorInterfaceVersion/major001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/majorInterfaceVersion/major001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -61,7 +61,9 @@ public class major001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/majorInterfaceVersion/major001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/majorInterfaceVersion/major001/TestDescription.java
index 0e11b925862..2cc8db72b44 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/majorInterfaceVersion/major001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/majorInterfaceVersion/major001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.VirtualMachineManager.majorInterfaceVersion.major001
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachineManager.majorInterfaceVersion.major001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/minorInterfaceVersion/minor001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/minorInterfaceVersion/minor001.java
index d2293425828..dcd986149f6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/minorInterfaceVersion/minor001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/minorInterfaceVersion/minor001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,9 @@ public class minor001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/minorInterfaceVersion/minor001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/minorInterfaceVersion/minor001/TestDescription.java
index 5e25980f4e5..8c5ec6c3f83 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/minorInterfaceVersion/minor001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/minorInterfaceVersion/minor001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.VirtualMachineManager.minorInterfaceVersion.minor001
- * @run main/othervm
+ * @run driver
* nsk.jdi.VirtualMachineManager.minorInterfaceVersion.minor001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001.java
index be8765be809..f3e0c7f583d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -78,7 +78,9 @@ public class voidtype001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001/TestDescription.java
index 097375e25db..cda411509b7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.VoidType._itself_.voidtype001
* nsk.jdi.VoidType._itself_.voidtype001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VoidType._itself_.voidtype001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/toString/tostring001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/toString/tostring001.java
index 37686b6f956..568afaee470 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/toString/tostring001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/toString/tostring001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -70,7 +70,10 @@ public class tostring001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/toString/tostring001/TestDescription.java
index 78b3d114708..625775aa01c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/toString/tostring001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/toString/tostring001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -51,7 +51,7 @@
* /test/lib
* @build nsk.jdi.VoidType.toString.tostring001
* nsk.jdi.VoidType.toString.tostring001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VoidType.toString.tostring001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001.java
index 0215c771cc9..9dc24173080 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -58,7 +58,7 @@
* /test/lib
* @build nsk.jdi.VoidValue.equals.equals001.equals001
* nsk.jdi.VoidValue.equals.equals001.equals001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VoidValue.equals.equals001.equals001
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -126,7 +126,9 @@ public class equals001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals002.java
index 8f15fca94d3..ae1a10e2afa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -71,7 +71,10 @@ public class equals002 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals002/TestDescription.java
index 9b4778cd4c9..0824550b995 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.VoidValue.equals.equals002
* nsk.jdi.VoidValue.equals.equals002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VoidValue.equals.equals002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.java
index 0c9495f3d88..3bf9632128d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.VoidValue.hashCode.hashcode001.hashcode001
* nsk.jdi.VoidValue.hashCode.hashcode001.hashcode001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VoidValue.hashCode.hashcode001.hashcode001
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -127,7 +127,9 @@ public class hashcode001 {
public static void main (String argv[]) {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001.java
index 632c380079e..f1d1baf06be 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -70,7 +70,10 @@ public class tostring001 {
//------------------------------------------------------- immutable common methods
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
private static void display(String msg) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001/TestDescription.java
index 6067e4a3cb1..166963bc3d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -52,7 +52,7 @@
* /test/lib
* @build nsk.jdi.VoidValue.toString.tostring001
* nsk.jdi.VoidValue.toString.tostring001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.VoidValue.toString.tostring001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/_itself_/wevent001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/_itself_/wevent001.java
index adfd1d56e2a..03d1b48e464 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/_itself_/wevent001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/_itself_/wevent001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -61,7 +61,10 @@ import java.io.*;
public class wevent001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/_itself_/wevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/_itself_/wevent001/TestDescription.java
index 5474717464e..dfe8bc529e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/_itself_/wevent001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/_itself_/wevent001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -59,7 +59,7 @@
* /test/lib
* @build nsk.jdi.WatchpointEvent._itself_.wevent001
* nsk.jdi.WatchpointEvent._itself_.wevent001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointEvent._itself_.wevent001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/field/field001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/field/field001.java
index f60ea00bca1..3868ad6c13c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/field/field001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/field/field001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -71,8 +71,11 @@ public class field001 {
static private volatile boolean done;
static private volatile int requestsCount, awpEventsCount, mwpEventsCount;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/field/field001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/field/field001/TestDescription.java
index 0dbd066e2b3..4a8cbc54e2d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/field/field001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/field/field001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.WatchpointEvent.field.field001
* nsk.jdi.WatchpointEvent.field.field001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointEvent.field.field001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001.java
index ab86e0dc272..765af72a7a8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -79,8 +79,11 @@ public class object001 {
static private volatile boolean done;
static private volatile int requestsCount, awpEventsCount, mwpEventsCount;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001/TestDescription.java
index e4ce0cef205..e0afa8a27dc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,7 @@
* /test/lib
* @build nsk.jdi.WatchpointEvent.object.object001
* nsk.jdi.WatchpointEvent.object.object001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointEvent.object.object001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/valueCurrent/valuecur001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/valueCurrent/valuecur001.java
index 34a0fad1f53..2f1f8dd620e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/valueCurrent/valuecur001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/valueCurrent/valuecur001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -68,8 +68,11 @@ public class valuecur001 {
static private volatile boolean done;
static private volatile int requestsCount, awpEventsCount, mwpEventsCount;
- public static void main (String args[]) {
- System.exit(run(args, System.out) + JCK_STATUS_BASE);
+ public static void main (String argv[]) {
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(final String args[], final PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/valueCurrent/valuecur001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/valueCurrent/valuecur001/TestDescription.java
index 519a9369970..33ea4b3b01a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/valueCurrent/valuecur001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/valueCurrent/valuecur001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -74,7 +74,7 @@
* /test/lib
* @build nsk.jdi.WatchpointEvent.valueCurrent.valuecur001
* nsk.jdi.WatchpointEvent.valueCurrent.valuecur001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointEvent.valueCurrent.valuecur001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/_bounds_/filters001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/_bounds_/filters001.java
index 8a444234744..89e69bdcf4e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/_bounds_/filters001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/_bounds_/filters001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -63,7 +63,10 @@ public class filters001 {
}
public static void main(String argv[]) {
- System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/_bounds_/filters001/TestDescription.java
index 975e7782173..0287bccea2c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/_bounds_/filters001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/_bounds_/filters001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -48,7 +48,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest._bounds_.filters001
* nsk.jdi.WatchpointRequest._bounds_.filters001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest._bounds_.filters001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter001.java
index 7446bd971e7..805633d6f07 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -62,7 +62,10 @@ import java.io.*;
public class filter001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter001/TestDescription.java
index f48a3efac7e..8600fefc496 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter001
* nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter002.java
index ecf875735db..5ff5802ca3c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -62,7 +62,10 @@ import java.io.*;
public class filter002 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter002/TestDescription.java
index eb0a2f2de77..f6d94cb4068 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter002
* nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003.java
index 35465295ad5..7b77beedc1a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class filter003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003/TestDescription.java
index 5121a229dba..b05f7eb13d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter003
* nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004.java
index c75f99d1638..6be78f1d596 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class filter004 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004/TestDescription.java
index da607a95190..ed2770cb97c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter004
* nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt001.java
index 06500aa6a94..3cc2fea2727 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,10 @@ import java.io.*;
public class filter_rt001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt001/TestDescription.java
index 49d3d3e5c59..5b67456c513 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt001
* nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt002.java
index 75da12ed92e..b9b62272522 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,10 @@ import java.io.*;
public class filter_rt002 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt002/TestDescription.java
index 235d9b6f4cd..4a2c7fd3cee 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt002
* nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003.java
index bc1eb909e2a..1fd6ae0ffde 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class filter_rt003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003/TestDescription.java
index 50c4bf4cb8c..6a8b8f39bd5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt003
* nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004.java
index 69267ff95c2..1e37d5cac41 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class filter_rt004 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004/TestDescription.java
index 2d0d4c0d987..2052fc40fcd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,7 +67,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt004
* nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt005.java
index 4f002b6b0c7..06d6506c1eb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,7 +77,10 @@ import java.io.*;
public class filter_rt005 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt005/TestDescription.java
index 55e28600569..c238a0bac67 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt005
* nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt006.java
index fee62ff52a8..e893db66aec 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,7 +77,10 @@ import java.io.*;
public class filter_rt006 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt006/TestDescription.java
index 62a6ca33558..baac476a5a3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt006
* nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt006a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s001.java
index 562efe4cac1..7f8b4330110 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,10 @@ import java.io.*;
public class filter_s001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s001/TestDescription.java
index ee55437906a..651b4eff649 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s001
* nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s002.java
index fccb6ab8b3e..bf2b5b09e53 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -67,7 +67,10 @@ import java.io.*;
public class filter_s002 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s002/TestDescription.java
index a31d3a974f4..9ff81dbdbb7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s002
* nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003.java
index a17ec910620..92234071cc6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class filter_s003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003/TestDescription.java
index e387af4cb1c..d8cdb64390e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s003
* nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004.java
index 3598282d176..21030c2bf40 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -88,7 +88,9 @@ public class filter_s004 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004/TestDescription.java
index 3d671c8ac13..0f9925c896e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -68,7 +68,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s004
* nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter001.java
index 6b54694b2ef..ffb27e2de2b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -71,7 +71,10 @@ import java.io.*;
public class instancefilter001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter001/TestDescription.java
index 44826950a1e..97608e69afe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter001
* nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter002.java
index ab5a0ca5104..ee2edf49704 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -72,7 +72,10 @@ import java.io.*;
public class instancefilter002 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter002/TestDescription.java
index b6a7758e5c7..31435e3febe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -71,7 +71,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter002
* nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003.java
index 6c9eaaf6189..1d71e9990d3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -89,7 +89,9 @@ public class instancefilter003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003/TestDescription.java
index 3ef08a7bb48..3cbe8b660d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter003
* nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004.java
index 20348cec785..12a0fdac2c8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -89,7 +89,9 @@ public class instancefilter004 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004/TestDescription.java
index d7809806830..46d00009f7d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -70,7 +70,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter004
* nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005.java
index 07b368a73da..005367911af 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class instancefilter005 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005/TestDescription.java
index 186eed163de..68d33e0d469 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter005
* nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006.java
index a03a1c041ba..e479bb104eb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -85,7 +85,9 @@ public class instancefilter006 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006/TestDescription.java
index 51517c4299c..bdc64f7b2cb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -69,7 +69,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter006
* nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter006a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter007.java
index 8d2095bb8f1..56547144436 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter007.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,7 +77,10 @@ import java.io.*;
public class instancefilter007 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter007/TestDescription.java
index 86fa996073c..9d9268ddfb2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter007/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -79,7 +79,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter007
* nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter007a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter007
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter008.java
index e800a5cfa52..0f5ce28ac2d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter008.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -77,7 +77,10 @@ import java.io.*;
public class instancefilter008 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter008/TestDescription.java
index 374f14b4783..f1eb12d78b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter008/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -79,7 +79,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter008
* nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter008a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter008
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter001.java
index 882a3cf3724..d5e3b8336eb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -65,7 +65,10 @@ import java.io.*;
public class addthreadfilter001 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter001/TestDescription.java
index 0a8e03d6e94..097c5a5f3c5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter001
* nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter002.java
index 1bc6e165d43..2c9e280e6ae 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -65,7 +65,10 @@ import java.io.*;
public class addthreadfilter002 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter002/TestDescription.java
index deef8bc2318..2e787042901 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -64,7 +64,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter002
* nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003.java
index 717a26cef3e..344d0e36428 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -92,7 +92,9 @@ public class addthreadfilter003 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003/TestDescription.java
index bf5ed54280b..ad5e225846c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter003
* nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter003a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter003
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004.java
index 2bf0958a17e..c875dcaa034 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -92,7 +92,9 @@ public class addthreadfilter004 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004/TestDescription.java
index 76db1c838b4..2477099349a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter004
* nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter004a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter004
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005.java
index 085082e6764..e5bc8a555ed 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -92,7 +92,9 @@ public class addthreadfilter005 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005/TestDescription.java
index 6f5985fe6c6..f9b7125b195 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter005
* nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter005a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter005
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006.java
index 5679dcf5831..3ee70ff8202 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -92,7 +92,9 @@ public class addthreadfilter006 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006/TestDescription.java
index c59c00053ce..23c0b0c30aa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -63,7 +63,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter006
* nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter006a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter006
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter007.java
index e8b7f6268e2..6421f22743c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter007.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -71,7 +71,10 @@ import java.io.*;
public class addthreadfilter007 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter007/TestDescription.java
index 89ac9ac7c95..a2701ccbc6f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter007/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter007
* nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter007a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter007
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter008.java
index 130510f45b6..275753fd76d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter008.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -71,7 +71,10 @@ import java.io.*;
public class addthreadfilter008 extends TestDebuggerType1 {
public static void main (String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter008/TestDescription.java
index 5d748882a53..2df53a7d66e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter008/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -72,7 +72,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter008
* nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter008a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter008
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001.java
index 52f7cb0d87c..36af014db0b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -83,7 +83,9 @@ public class field001 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001/TestDescription.java
index 7e9ee6a85b1..8f22002d7a7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.field.field001
* nsk.jdi.WatchpointRequest.field.field001a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.field.field001
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002.java
index 4081b4bd988..3fbbeb5915b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -84,7 +84,9 @@ public class field002 extends JDIBase {
int result = run(argv, System.out);
- System.exit(result + PASS_BASE);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002/TestDescription.java
index 496fa5c552d..9a54674e994 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002/TestDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,7 @@
* /test/lib
* @build nsk.jdi.WatchpointRequest.field.field002
* nsk.jdi.WatchpointRequest.field.field002a
- * @run main/othervm
+ * @run driver
* nsk.jdi.WatchpointRequest.field.field002
* -verbose
* -arch=${os.family}-${os.simpleArch}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/ClassPrepareEvents/ClassPrepareEvents001/ClassPrepareEvents001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/ClassPrepareEvents/ClassPrepareEvents001/ClassPrepareEvents001.java
index c268f229632..30cda633187 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/ClassPrepareEvents/ClassPrepareEvents001/ClassPrepareEvents001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/ClassPrepareEvents/ClassPrepareEvents001/ClassPrepareEvents001.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -38,7 +38,7 @@
* @library /vmTestbase
* /test/lib
* @build nsk.jdi.stress.ClassPrepareEvents.ClassPrepareEvents001.ClassPrepareEvents001
- * @run main/othervm
+ * @run driver
* nsk.jdi.stress.ClassPrepareEvents.ClassPrepareEvents001.ClassPrepareEvents001
* -verbose
* -arch=${os.family}-${os.simpleArch}
@@ -59,7 +59,10 @@ import nsk.share.jpda.AbstractDebuggeeTest;
public class ClassPrepareEvents001 extends TestDebuggerType2 {
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Binder.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Binder.java
index 8897d07459c..fdc2717553e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Binder.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Binder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -187,8 +187,7 @@ public class Binder extends DebugeeBinder {
Debugee debugee = null;
- String classPath = null;
-// classPath = System.getProperty("java.class.path");
+ String classPath = System.getProperty("test.class.path");
prepareForPipeConnection(argumentHandler);
@@ -755,11 +754,9 @@ public class Binder extends DebugeeBinder {
vmArgs += " -Djdk.virtualThreadScheduler.parallelism=15";
}
-/*
- if (classPath != null) {
+ if (classPath != null && !vmArgs.contains("-cp") && !vmArgs.contains("-classpath")) {
vmArgs += " -classpath " + quote + classPath + quote;
}
- */
if (vmArgs.length() > 0) {
arg = (Connector.StringArgument) arguments.get("options");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ClassExclusionFilterTest.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ClassExclusionFilterTest.java
index b2f608ed513..8f25342f185 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ClassExclusionFilterTest.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ClassExclusionFilterTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -22,7 +22,6 @@
*/
package nsk.share.jdi;
-import nsk.share.Consts;
import nsk.share.TestBug;
import java.io.PrintStream;
@@ -38,7 +37,10 @@ public class ClassExclusionFilterTest extends EventFilterTest {
protected String[] classPatterns;
public static void main(String[] argv) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String[] argv, PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ClassFilterTest_ClassName.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ClassFilterTest_ClassName.java
index 846a83eb480..aa34068c850 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ClassFilterTest_ClassName.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ClassFilterTest_ClassName.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -34,7 +34,10 @@ import java.io.PrintStream;
*/
public class ClassFilterTest_ClassName extends ClassExclusionFilterTest {
public static void main(String[] argv) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String[] argv, PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ClassFilterTest_ReferenceType.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ClassFilterTest_ReferenceType.java
index 2cda0dc1967..760c812acbe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ClassFilterTest_ReferenceType.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ClassFilterTest_ReferenceType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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,7 +35,10 @@ import java.io.PrintStream;
*/
public class ClassFilterTest_ReferenceType extends ClassExclusionFilterTest {
public static void main(String[] argv) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String[] argv, PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/InstanceFilterTest.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/InstanceFilterTest.java
index 01d3b9e7769..277901178e3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/InstanceFilterTest.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/InstanceFilterTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -23,7 +23,6 @@
package nsk.share.jdi;
import com.sun.jdi.ObjectReference;
-import nsk.share.Consts;
import nsk.share.TestBug;
import java.io.PrintStream;
@@ -39,7 +38,10 @@ import java.util.List;
*/
public class InstanceFilterTest extends EventFilterTest {
public static void main(String[] argv) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String[] argv, PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/OwnedMonitorsDebugger.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/OwnedMonitorsDebugger.java
index 663d71080ce..0a7d95fdbc6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/OwnedMonitorsDebugger.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/OwnedMonitorsDebugger.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, 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
@@ -64,7 +64,10 @@ public class OwnedMonitorsDebugger extends TestDebuggerType2 {
}
public static void main(String argv[]) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/SerialExecutionDebugger.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/SerialExecutionDebugger.java
index 82707cc07ad..48546cc6a63 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/SerialExecutionDebugger.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/SerialExecutionDebugger.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, 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
@@ -62,7 +62,10 @@ import jdk.test.lib.Utils;
*/
public class SerialExecutionDebugger extends TestDebuggerType2 {
static public void main(String[] args) {
- System.exit(Consts.JCK_STATUS_BASE + new SerialExecutionDebugger().runIt(args, System.out));
+ int result = new SerialExecutionDebugger().runIt(args, System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public String debuggeeClassName() {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/StressTestTemplate.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/StressTestTemplate.java
index 700d05f6393..be7735d712c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/StressTestTemplate.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/StressTestTemplate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -46,7 +46,10 @@ public class StressTestTemplate extends JDIEventsDebugger {
protected int threadsNumber = 1;
public static void main(String[] argv) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String[] argv, PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/TestDebuggerType1.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/TestDebuggerType1.java
index 02157c626cb..aa40fd36fe5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/TestDebuggerType1.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/TestDebuggerType1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, 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
@@ -41,7 +41,10 @@ import nsk.share.*;
* - the subclass must have 'main' and 'run' methods
* defined like:
* public static void main (String argv[]) {
- * System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ * int result = run(argv,System.out);
+ * if (result != 0) {
+ * throw new RuntimeException("TEST FAILED with result " + result);
+ * }
* }
*
* public static int run (String argv[], PrintStream out) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ThreadFilterTest.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ThreadFilterTest.java
index 53a6398c4c0..b7c6dd63523 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ThreadFilterTest.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ThreadFilterTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -38,7 +38,10 @@ import java.util.List;
*/
public class ThreadFilterTest extends EventFilterTest {
public static void main(String[] argv) {
- System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
+ int result = run(argv,System.out);
+ if (result != 0) {
+ throw new RuntimeException("TEST FAILED with result " + result);
+ }
}
public static int run(String[] argv, PrintStream out) {