Skip to content

Commit 3d8d4df

Browse files
Fix cross-dc security manager usage. Port some Lucene test setup (#3285)
1 parent bb195e6 commit 3d8d4df

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ ext {
114114
logger.debug('Lucene base version (without suffix): {}', luceneBaseVersion)
115115
return luceneBaseVersion
116116
}
117+
118+
// For testing code
119+
vectorIncubatorJavaVersions = [ JavaVersion.VERSION_21, JavaVersion.VERSION_22, JavaVersion.VERSION_23, JavaVersion.VERSION_24, JavaVersion.VERSION_25 ] as Set
117120
}
118121

119122
// Include smaller chunks configuring dedicated build areas.

gradle/testing/defaults-tests.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,13 @@ allprojects {
113113

114114
jvmArgs Commandline.translateCommandline(resolvedTestOption("tests.jvmargs"))
115115

116+
// Enable the vector incubator module on supported Java versions:
117+
if (rootProject.vectorIncubatorJavaVersions.contains(rootProject.runtimeJavaVersion)) {
118+
jvmArgs '--add-modules', 'jdk.incubator.vector'
119+
}
120+
121+
jvmArgs '--enable-native-access=ALL-UNNAMED'
122+
116123
def loggingConfigFile = layout.projectDirectory.file("${resources}/logging.properties")
117124
def tempDir = layout.projectDirectory.dir(testsTmpDir.toString())
118125
jvmArgumentProviders.add(

gradle/testing/randomization.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ allprojects {
204204
def useSecurityManager = Boolean.parseBoolean(testOptionsResolved["tests.useSecurityManager"]);
205205
// Allow the project to override this
206206
if (project.ext.has("useSecurityManager")) {
207-
useSecurityManager = project.ext.get("useSecurityManager")
207+
useSecurityManager &= project.ext.get("useSecurityManager")
208208
}
209209
if (useSecurityManager) {
210210
def commonSolrDir = project(':solr').layout.projectDirectory

0 commit comments

Comments
 (0)