OpenJDK / jdk / jdk
changeset 47019:06122340dbf7
8186719: [testbug] add @requires vm.cds to CDS tests in jdk test suite
Reviewed-by: dholmes, iklam
| author | goetz |
|---|---|
| date | Tue, 29 Aug 2017 17:29:19 +0200 |
| parents | 7c8ff90abc22 |
| children | 2c55106dc37b b119a24038a8 |
| files | jdk/test/TEST.ROOT jdk/test/com/sun/jdi/cds/CDSBreakpointTest.java jdk/test/com/sun/jdi/cds/CDSDeleteAllBkptsTest.java jdk/test/com/sun/jdi/cds/CDSFieldWatchpoints.java |
| diffstat | 4 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/test/TEST.ROOT Tue Aug 29 20:23:14 2017 +0530 +++ b/jdk/test/TEST.ROOT Tue Aug 29 17:29:19 2017 +0200 @@ -26,7 +26,17 @@ groups=TEST.groups [closed/TEST.groups] # Allow querying of various System properties in @requires clauses -requires.properties=sun.arch.data.model java.runtime.name +# +# Source files for classes that will be used at the beginning of each test suite run, +# to determine additional characteristics of the system for use with the @requires tag. +# Note: compiled bootlibs code will be located in the folder 'bootClasses' +requires.extraPropDefns = ../../test/jtreg-ext/requires/VMProps.java [../../closed/test/jtreg-ext/requires/VMPropsExt.java] +requires.extraPropDefns.bootlibs = ../../test/lib/sun ../../test/lib/jdk/test/lib/Platform.java +requires.extraPropDefns.vmOpts = -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:bootClasses +requires.properties= \ + sun.arch.data.model \ + java.runtime.name \ + vm.cds # Minimum jtreg version requiredVersion=4.2 b08
--- a/jdk/test/com/sun/jdi/cds/CDSBreakpointTest.java Tue Aug 29 20:23:14 2017 +0530 +++ b/jdk/test/com/sun/jdi/cds/CDSBreakpointTest.java Tue Aug 29 17:29:19 2017 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ * @test * @bug 8054386 * @summary java debugging test for CDS + * @requires vm.cds * @modules jdk.jdi * java.management * jdk.jartool/sun.tools.jar
--- a/jdk/test/com/sun/jdi/cds/CDSDeleteAllBkptsTest.java Tue Aug 29 20:23:14 2017 +0530 +++ b/jdk/test/com/sun/jdi/cds/CDSDeleteAllBkptsTest.java Tue Aug 29 17:29:19 2017 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ * @test * @bug 8054386 * @summary java debugging test for CDS + * @requires vm.cds * @modules jdk.jdi * java.management * jdk.jartool/sun.tools.jar
--- a/jdk/test/com/sun/jdi/cds/CDSFieldWatchpoints.java Tue Aug 29 20:23:14 2017 +0530 +++ b/jdk/test/com/sun/jdi/cds/CDSFieldWatchpoints.java Tue Aug 29 17:29:19 2017 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ * @test * @bug 8054386 * @summary java debugging test for CDS + * @requires vm.cds * @modules jdk.jdi * java.management * jdk.jartool/sun.tools.jar