8191788: add jdk.internal.vm.compiler to --limit-modules if -Djvmci.Compiler=graal is in the command line
Skip tests which use --limit-modules when Graal is used as JIT compiler. Reviewed-by: alanb, mchung, dholmes, ccheung, dnsimon
This commit is contained in:
parent
0c05e5a478
commit
c11f132abe
.hgignore
test
hotspot/jtreg/runtime
SharedArchiveFile
appcds/jigsaw
jdk
TEST.ROOT
com/sun/tools/attach/modules
java
lang
String/concat
System/LoggerFinder/LoggerFinderAPI
instrument
management/ManagementFactory
net/SocketOption
nio/channels
DatagramChannel
ServerSocketChannel
SocketChannel
tools/launcher/modules
limitmods
listmods
showmoduleresolution
@ -11,3 +11,5 @@ nbproject/private/
|
||||
test/nashorn/script/external
|
||||
test/nashorn/lib
|
||||
NashornProfile.txt
|
||||
.*/JTreport/.*
|
||||
.*/JTwork/.*
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @requires vm.cds
|
||||
* @requires vm.cds & !vm.graal.enabled
|
||||
* @summary Testing -Xbootclasspath/a support for CDS
|
||||
* @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
|
||||
* @library /test/lib
|
||||
|
@ -27,7 +27,7 @@
|
||||
* @summary Test combinations of jigsaw options that affect the use of AppCDS
|
||||
*
|
||||
* AppCDS does not support uncompressed oops
|
||||
* @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
|
||||
* @requires ((vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)) & !vm.graal.enabled
|
||||
* @library /test/lib ..
|
||||
* @modules java.base/jdk.internal.misc
|
||||
* java.management
|
||||
|
@ -25,7 +25,7 @@
|
||||
/**
|
||||
* @test
|
||||
* @summary AppCDS tests for testing -Xbootclasspath/a
|
||||
* @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
|
||||
* @requires ((vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)) & !vm.graal.enabled
|
||||
* @library /test/lib /test/hotspot/jtreg/runtime/appcds
|
||||
* @modules java.base/jdk.internal.misc
|
||||
* java.management
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
|
||||
* @requires ((vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)) & !vm.graal.enabled
|
||||
* @library ../..
|
||||
* @library /test/lib
|
||||
* @modules java.base/jdk.internal.misc
|
||||
|
@ -29,7 +29,7 @@
|
||||
* 2) app loader will load the class from the jimage by default;
|
||||
* app loader will load the class from the bootclasspath if the
|
||||
* "--limit-modules java.base" option is specified
|
||||
* @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
|
||||
* @requires ((vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)) & !vm.graal.enabled
|
||||
* @library /test/lib /test/hotspot/jtreg/runtime/appcds
|
||||
* @modules java.base/jdk.internal.misc
|
||||
* java.management
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
|
||||
* @requires ((vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)) & !vm.graal.enabled
|
||||
* @library ../..
|
||||
* @library /test/lib
|
||||
* @modules java.base/jdk.internal.misc
|
||||
|
@ -36,6 +36,7 @@ requires.extraPropDefns.vmOpts = -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
|
||||
requires.properties= \
|
||||
sun.arch.data.model \
|
||||
java.runtime.name \
|
||||
vm.graal.enabled \
|
||||
vm.cds
|
||||
|
||||
# Minimum jtreg version
|
||||
|
@ -23,6 +23,7 @@
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @requires !vm.graal.enabled
|
||||
* @modules jdk.attach
|
||||
* @build m/* Agent
|
||||
* @run main/othervm -Djdk.attach.allowAttachSelf m/p.Main jmx javaagent
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2016, 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
|
||||
@ -27,6 +27,7 @@ import java.security.Permission;
|
||||
* @test
|
||||
* @summary String concatenation fails with a custom SecurityManager that uses concatenation
|
||||
* @bug 8155090 8158851
|
||||
* @requires !vm.graal.enabled
|
||||
*
|
||||
* @compile WithSecurityManager.java
|
||||
*
|
||||
|
@ -46,6 +46,7 @@ import java.util.ResourceBundle;
|
||||
* throwing NullPointerException. The test uses --limit-module
|
||||
* to force the selection of one or the other.
|
||||
* @author danielfuchs
|
||||
* @requires !vm.graal.enabled
|
||||
* @build LoggerFinderAPI
|
||||
* @run main/othervm --limit-modules java.base,java.logging
|
||||
* -Djava.util.logging.SimpleFormatter.format=LOG-%4$s:-[%2$s]-%5$s%6$s%n
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2016, 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
|
||||
@ -24,6 +24,7 @@
|
||||
/**
|
||||
*
|
||||
* @test
|
||||
* @requires !vm.graal.enabled
|
||||
* @summary Tests that the -javaagent option adds the java.instrument into
|
||||
* the module graph
|
||||
*
|
||||
|
@ -26,6 +26,7 @@
|
||||
* @bug 8151099
|
||||
* @summary Verify platform MXBeans initialized properly with java.management
|
||||
* module only. No other management provider
|
||||
* @requires !vm.graal.enabled
|
||||
* @modules java.management
|
||||
* @run main/othervm --limit-modules=java.management DefaultManagementProviderTest
|
||||
*/
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2014, 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
|
||||
@ -24,6 +24,7 @@
|
||||
/*
|
||||
* @test
|
||||
* @bug 8036979 8072384 8044773
|
||||
* @requires !vm.graal.enabled
|
||||
* @run main/othervm -Xcheck:jni OptionsTest
|
||||
* @run main/othervm -Xcheck:jni -Djava.net.preferIPv4Stack=true OptionsTest
|
||||
* @run main/othervm --limit-modules=java.base OptionsTest
|
||||
|
@ -32,6 +32,7 @@ import java.util.List;
|
||||
* @bug 8143554 8044773
|
||||
* @summary Test checks that UnsupportedOperationException for unsupported
|
||||
* SOCKET_OPTIONS is thrown by both getOption() and setOption() methods.
|
||||
* @requires !vm.graal.enabled
|
||||
* @run main UnsupportedOptionsTest
|
||||
* @run main/othervm --limit-modules=java.base UnsupportedOptionsTest
|
||||
*/
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2007, 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
|
||||
@ -24,6 +24,7 @@
|
||||
/* @test
|
||||
* @bug 4640544 8044773
|
||||
* @summary Unit test for setOption/getOption/options methods
|
||||
* @requires !vm.graal.enabled
|
||||
* @run main SocketOptionTests
|
||||
* @run main/othervm --limit-modules=java.base SocketOptionTests
|
||||
*/
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2007, 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 @@
|
||||
* @bug 4640544 8044773
|
||||
* @summary Unit test for ServerSocketChannel setOption/getOption/options
|
||||
* methods.
|
||||
* @requires !vm.graal.enabled
|
||||
* @run main SocketOptionTests
|
||||
* @run main/othervm --limit-modules=java.base SocketOptionTests
|
||||
*/
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2007, 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 @@
|
||||
* @bug 4640544 8044773
|
||||
* @summary Unit test to check SocketChannel setOption/getOption/options
|
||||
* methods.
|
||||
* @requires !vm.graal.enabled
|
||||
* @run main SocketOptionTests
|
||||
* @run main/othervm --limit-modules=java.base SocketOptionTests
|
||||
*/
|
||||
|
@ -23,6 +23,7 @@
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @requires !vm.graal.enabled
|
||||
* @library /lib/testlibrary /test/lib
|
||||
* @modules java.desktop java.logging jdk.compiler
|
||||
* @build LimitModsTest jdk.test.lib.compiler.CompilerUtils jdk.testlibrary.*
|
||||
|
@ -23,6 +23,7 @@
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @requires !vm.graal.enabled
|
||||
* @library /lib/testlibrary /test/lib
|
||||
* @modules java.se
|
||||
* @build ListModsTest jdk.test.lib.compiler.CompilerUtils jdk.testlibrary.*
|
||||
|
@ -23,6 +23,7 @@
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @requires !vm.graal.enabled
|
||||
* @modules jdk.jdeps jdk.zipfs
|
||||
* @library /lib/testlibrary
|
||||
* @build ShowModuleResolutionTest jdk.testlibrary.*
|
||||
|
Loading…
x
Reference in New Issue
Block a user