Skip to content

Commit dc19bac

Browse files
author
David Holmes
committed
8268094: Some vmTestbase/nsk tests fail after ACC_STRICT/strictfp changes
Reviewed-by: vlivanov, rehn
1 parent 2963c9e commit dc19bac

File tree

14 files changed

+13
-339
lines changed

14 files changed

+13
-339
lines changed

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2002, 2021, 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,8 +57,6 @@
5757
* 4. adding <final> modifiers to 4 methods <br>
5858
* 5. adding <synchronized> modifiers to public method <br>
5959
* 6. adding <synchronized> modifiers to 4 methods <br>
60-
* 7. adding <strictfp> modifiers to public method <br>
61-
* 8. adding <strictfp> modifiers to 4 methods <br>
6260
* The test checks two different cases for suspended debugee and not
6361
* suspended one.
6462
*
@@ -82,8 +80,6 @@ public class redefineclasses007 {
8280
{"newclass04","adding <final> modifiers to 4 methods"},
8381
{"newclass05","adding <synchronized> modifiers to public method"},
8482
{"newclass06","adding <synchronized> modifiers to 4 methods"},
85-
{"newclass07","adding <strictfp> modifiers to public method"},
86-
{"newclass08","adding <strictfp> modifiers to 4 methods"}
8783
};
8884

8985
private final static String newClassFile = File.separator

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007/TestDescription.java

Lines changed: 2 additions & 5 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, 2021, 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,8 +48,6 @@
4848
* 4. newclass04 - adding <final> modifiers to 4 methods
4949
* 5. newclass05 - adding <synchronized> modifiers to public method
5050
* 6. newclass06 - adding <synchronized> modifiers to 4 methods
51-
* 7. newclass07 - adding <strictfp> modifiers to public method
52-
* 8. newclass08 - adding <strictfp> modifiers to 4 methods
5351
* The test checks two different cases for suspended debugee and not
5452
* suspended one.
5553
* COMMENTS:
@@ -67,7 +65,7 @@
6765
* with full debug info
6866
* @run driver nsk.share.ExtraClassesBuilder
6967
* -g:lines,source,vars
70-
* newclass01 newclass02 newclass03 newclass04 newclass05 newclass06 newclass07 newclass08
68+
* newclass01 newclass02 newclass03 newclass04 newclass05 newclass06
7169
*
7270
* @run main/othervm
7371
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses007
@@ -79,4 +77,3 @@
7977
* -transport.address=dynamic
8078
* -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
8179
*/
82-

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007/newclass07/redefineclasses007a.java

Lines changed: 0 additions & 76 deletions
This file was deleted.

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007/newclass08/redefineclasses007a.java

Lines changed: 0 additions & 76 deletions
This file was deleted.

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2002, 2021, 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
@@ -56,8 +56,6 @@
5656
* 4.newclass04 - adding <final> modifiers to 3 methods <br>
5757
* 5.newclass05 - adding <synchronized> modifiers to public method <br>
5858
* 6.newclass06 - adding <synchronized> modifiers to 3 methods <br>
59-
* 7.newclass07 - adding <strictfp> modifiers to public method <br>
60-
* 8.newclass08 - adding <strictfp> modifiers to 3 methods <br>
6159
* The test checks two different cases for suspended debugee and not
6260
* suspended one.
6361
* When <code>canRedefineClasses()</code> is <code>false</code>, the test is
@@ -80,8 +78,6 @@ public class redefineclasses008 {
8078
{"newclass04","adding <final> modifiers to 3 methods"},
8179
{"newclass05","adding <synchronized> modifiers to public method"},
8280
{"newclass06","adding <synchronized> modifiers to 3 methods"},
83-
{"newclass07","adding <strictfp> modifiers to public method"},
84-
{"newclass08","adding <strictfp> modifiers to 3 methods"}
8581
};
8682

8783
private final static String newClassFile = File.separator

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008/TestDescription.java

Lines changed: 2 additions & 5 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, 2021, 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
@@ -47,8 +47,6 @@
4747
* 4. newclass04 - adding <final> modifiers to 3 methods
4848
* 5. newclass05 - adding <synchronized> modifiers to public method
4949
* 6. newclass06 - adding <synchronized> modifiers to 3 methods
50-
* 7. newclass07 - adding <strictfp> modifiers to public method
51-
* 8. newclass08 - adding <strictfp> modifiers to 3 methods
5250
* The test checks two different cases for suspended debugee and not
5351
* suspended one.
5452
* COMMENTS:
@@ -69,7 +67,7 @@
6967
* with full debug info
7068
* @run driver nsk.share.ExtraClassesBuilder
7169
* -g:lines,source,vars
72-
* newclass01 newclass02 newclass03 newclass04 newclass05 newclass06 newclass07 newclass08
70+
* newclass01 newclass02 newclass03 newclass04 newclass05 newclass06
7371
*
7472
* @run main/othervm
7573
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses008
@@ -81,4 +79,3 @@
8179
* -transport.address=dynamic
8280
* -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
8381
*/
84-

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008/newclass07/redefineclasses008a.java

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)