Skip to content

Commit 740e82f

Browse files
GoeLinGoeLin
committed
backport 771f6a2f8e236e224b0e33b89f664c4bfc49e595
1 parent 8a171f5 commit 740e82f

File tree

2,080 files changed

+7202
-4636
lines changed

Some content is hidden

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

2,080 files changed

+7202
-4636
lines changed

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001.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
@@ -96,7 +96,10 @@ public class awevent001 {
9696
private Object gotEvent = new Object();
9797

9898
public static void main (String argv[]) {
99-
System.exit(run(argv,System.out) + JCK_STATUS_BASE);
99+
int result = run(argv,System.out);
100+
if (result != 0) {
101+
throw new RuntimeException("TEST FAILED with result " + result);
102+
}
100103
}
101104

102105
public static int run(String argv[], PrintStream out) {

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001/TestDescription.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 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
* @clean nsk.jdi.AccessWatchpointEvent._itself_.awevent001t
6161
* @compile -g:lines,source,vars ../awevent001t.java
6262
*
63-
* @run main/othervm
63+
* @run driver
6464
* nsk.jdi.AccessWatchpointEvent._itself_.awevent001
6565
* -verbose
6666
* -arch=${os.family}-${os.simpleArch}

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 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
@@ -80,13 +80,12 @@ public class accipp001 extends Log {
8080
{debugeeName+"$P", "package private"}
8181
};
8282

83-
/**
84-
* Re-call to <code>run(args,out)</code>, and exit with
85-
* either status 95 or 97 (JCK-like exit status).
86-
*/
87-
public static void main (String args[]) {
88-
int exitCode = run(args,System.out);
89-
System.exit(exitCode + 95);
83+
84+
public static void main (String argv[]) {
85+
int result = run(argv,System.out);
86+
if (result != 0) {
87+
throw new RuntimeException("TEST FAILED with result " + result);
88+
}
9089
}
9190

9291
/**

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001/TestDescription.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 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
* /test/lib
5656
* @build nsk.jdi.Accessible.isPackagePrivate.accipp001
5757
* nsk.jdi.Accessible.isPackagePrivate.accipp001a
58-
* @run main/othervm
58+
* @run driver
5959
* nsk.jdi.Accessible.isPackagePrivate.accipp001
6060
* -verbose
6161
* -arch=${os.family}-${os.simpleArch}

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 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
@@ -64,7 +64,10 @@ public class accipp002 {
6464
//------------------------------------------------------- immutable common methods
6565

6666
public static void main(String argv[]) {
67-
System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
67+
int result = run(argv,System.out);
68+
if (result != 0) {
69+
throw new RuntimeException("TEST FAILED with result " + result);
70+
}
6871
}
6972

7073
private static void display(String msg) {

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002/TestDescription.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 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
@@ -50,7 +50,7 @@
5050
* /test/lib
5151
* @build nsk.jdi.Accessible.isPackagePrivate.accipp002
5252
* nsk.jdi.Accessible.isPackagePrivate.accipp002a
53-
* @run main/othervm
53+
* @run driver
5454
* nsk.jdi.Accessible.isPackagePrivate.accipp002
5555
* -verbose
5656
* -arch=${os.family}-${os.simpleArch}

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 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
@@ -86,13 +86,13 @@ public class isPrivate001 extends Log {
8686
};
8787

8888

89-
/**
90-
* Re-call to <code>run(args,out)</code>, and exit with
91-
* either status 95 or 97 (JCK-like exit status).
92-
*/
89+
9390
public static void main (String argv[]) {
94-
int exitCode = run(argv,System.out);
95-
System.exit(exitCode + 95/*STATUS_TEMP*/);
91+
int result = run(argv,System.out);
92+
if (result != 0) {
93+
throw new RuntimeException("TEST FAILED with result " + result);
94+
}
95+
9696
}
9797

9898
/**

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001/TestDescription.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 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
@@ -48,7 +48,7 @@
4848
* /test/lib
4949
* @build nsk.jdi.Accessible.isPrivate.isPrivate001
5050
* nsk.jdi.Accessible.isPrivate.isPrivate001a
51-
* @run main/othervm
51+
* @run driver
5252
* nsk.jdi.Accessible.isPrivate.isPrivate001
5353
* -verbose
5454
* -arch=${os.family}-${os.simpleArch}

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 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
@@ -64,7 +64,10 @@ public class isprivate002 {
6464
//------------------------------------------------------- immutable common methods
6565

6666
public static void main(String argv[]) {
67-
System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
67+
int result = run(argv,System.out);
68+
if (result != 0) {
69+
throw new RuntimeException("TEST FAILED with result " + result);
70+
}
6871
}
6972

7073
private static void display(String msg) {

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002/TestDescription.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 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
@@ -50,7 +50,7 @@
5050
* /test/lib
5151
* @build nsk.jdi.Accessible.isPrivate.isprivate002
5252
* nsk.jdi.Accessible.isPrivate.isprivate002a
53-
* @run main/othervm
53+
* @run driver
5454
* nsk.jdi.Accessible.isPrivate.isprivate002
5555
* -verbose
5656
* -arch=${os.family}-${os.simpleArch}

0 commit comments

Comments
 (0)