Skip to content
Permalink
Browse files
Automatic merge of jdk:master into master
  • Loading branch information
duke committed Jun 7, 2021
2 parents 7390333 + a91f971 commit 91d5a8a6d004d7964e79a575b2397869254ce468
Showing 2 changed files with 1 addition and 4 deletions.
@@ -767,7 +767,7 @@ define SetupRunJtregTestBody
-vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE) \
-vmoption:-Djava.io.tmpdir="$$($1_TEST_TMP_DIR)"

$1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet -Djavatest.security.noSecurityManager=true
$1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet

# Make it possible to specify the JIB_DATA_DIR for tests using the
# JIB Artifact resolver
@@ -48,9 +48,6 @@ tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java
tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java 8057687 generic-all emit correct byte code an attributes for type annotations
tools/javac/warnings/suppress/TypeAnnotations.java 8057683 generic-all improve ordering of errors with type annotations
tools/javac/modules/SourceInSymlinkTest.java 8180263 windows-all fails when run on a subst drive
tools/javac/processing/options/XprintRepeatingAnnotations.java 8265611 generic-all @compile/ref comparison fails when noSecurityManager=true
tools/javac/processing/options/XprintDocComments.java 8265611 generic-all @compile/ref comparison fails when noSecurityManager=true
tools/javac/processing/model/util/printing/module-info.java 8265611 generic-all @compile/ref comparison fails when noSecurityManager=true

###########################################################################
#

0 comments on commit 91d5a8a

Please sign in to comment.