Skip to content

Commit 6def786

Browse files
GoeLinGoeLin
committed
8330534: Update nsk/jdwp tests to use driver instead of othervm
Backport-of: 56e8e60792b23bc101f46b497dcc9d3c76855384
1 parent a2b929f commit 6def786

File tree

219 files changed

+824
-482
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+824
-482
lines changed

‎test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues001.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -89,7 +89,10 @@ public class getvalues001 {
8989
* Start test from command line.
9090
*/
9191
public static void main (String argv[]) {
92-
System.exit(run(argv,System.out) + JCK_STATUS_BASE);
92+
int result = run(argv, System.out);
93+
if (result != 0) {
94+
throw new RuntimeException("Test failed");
95+
}
9396
}
9497

9598
/**

‎test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues001/TestDescription.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,7 @@
5858
* @library /vmTestbase /test/hotspot/jtreg/vmTestbase
5959
* /test/lib
6060
* @build nsk.jdwp.ArrayReference.GetValues.getvalues001a
61-
* @run main/othervm
61+
* @run driver
6262
* nsk.jdwp.ArrayReference.GetValues.getvalues001
6363
* -arch=${os.family}-${os.simpleArch}
6464
* -verbose

‎test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues002.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -116,7 +116,10 @@ public class getvalues002 {
116116
* Start test from command line.
117117
*/
118118
public static void main (String argv[]) {
119-
System.exit(run(argv,System.out) + JCK_STATUS_BASE);
119+
int result = run(argv, System.out);
120+
if (result != 0) {
121+
throw new RuntimeException("Test failed");
122+
}
120123
}
121124

122125
/**

‎test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/GetValues/getvalues002/TestDescription.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,7 @@
6060
* @library /vmTestbase /test/hotspot/jtreg/vmTestbase
6161
* /test/lib
6262
* @build nsk.jdwp.ArrayReference.GetValues.getvalues002a
63-
* @run main/othervm
63+
* @run driver
6464
* nsk.jdwp.ArrayReference.GetValues.getvalues002
6565
* -arch=${os.family}-${os.simpleArch}
6666
* -verbose

‎test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/Length/length001.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -85,7 +85,10 @@ public class length001 {
8585
* Start test from command line.
8686
*/
8787
public static void main (String argv[]) {
88-
System.exit(run(argv,System.out) + JCK_STATUS_BASE);
88+
int result = run(argv, System.out);
89+
if (result != 0) {
90+
throw new RuntimeException("Test failed");
91+
}
8992
}
9093

9194
/**

‎test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/Length/length001/TestDescription.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,7 @@
5757
* @library /vmTestbase /test/hotspot/jtreg/vmTestbase
5858
* /test/lib
5959
* @build nsk.jdwp.ArrayReference.Length.length001a
60-
* @run main/othervm
60+
* @run driver
6161
* nsk.jdwp.ArrayReference.Length.length001
6262
* -arch=${os.family}-${os.simpleArch}
6363
* -verbose

‎test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/SetValues/setvalues001.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -92,7 +92,10 @@ public class setvalues001 {
9292
* Start test from command line.
9393
*/
9494
public static void main (String argv[]) {
95-
System.exit(run(argv,System.out) + JCK_STATUS_BASE);
95+
int result = run(argv, System.out);
96+
if (result != 0) {
97+
throw new RuntimeException("Test failed");
98+
}
9699
}
97100

98101
/**

‎test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayReference/SetValues/setvalues001/TestDescription.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,7 @@
6060
* @library /vmTestbase /test/hotspot/jtreg/vmTestbase
6161
* /test/lib
6262
* @build nsk.jdwp.ArrayReference.SetValues.setvalues001a
63-
* @run main/othervm
63+
* @run driver
6464
* nsk.jdwp.ArrayReference.SetValues.setvalues001
6565
* -arch=${os.family}-${os.simpleArch}
6666
* -verbose

‎test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayType/NewInstance/newinstance001.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -84,7 +84,10 @@ public class newinstance001 {
8484
* Start test from command line.
8585
*/
8686
public static void main (String argv[]) {
87-
System.exit(run(argv,System.out) + JCK_STATUS_BASE);
87+
int result = run(argv, System.out);
88+
if (result != 0) {
89+
throw new RuntimeException("Test failed");
90+
}
8891
}
8992

9093
/**

‎test/hotspot/jtreg/vmTestbase/nsk/jdwp/ArrayType/NewInstance/newinstance001/TestDescription.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,7 @@
5555
* @library /vmTestbase /test/hotspot/jtreg/vmTestbase
5656
* /test/lib
5757
* @build nsk.jdwp.ArrayType.NewInstance.newinstance001a
58-
* @run main/othervm
58+
* @run driver
5959
* nsk.jdwp.ArrayType.NewInstance.newinstance001
6060
* -arch=${os.family}-${os.simpleArch}
6161
* -verbose

0 commit comments

Comments
 (0)