Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Use lazy file types (#1345)

Tyler Bertrandbde8c14bddec
diff --git a/gradle/testing/defaults-tests.gradle b/gradle/testing/defaults-tests.gradle
index ea2addff4d7..6783a04c6d7 100644
--- a/gradle/testing/defaults-tests.gradle
+++ b/gradle/testing/defaults-tests.gradle
@@ -119,10 +119,12 @@ allprojects {
jvmArgs '--illegal-access=deny'
}
+ def loggingConfigFile = layout.projectDirectory.file("${resources}/logging.properties")
+ def tempDir = layout.projectDirectory.dir(testsTmpDir.toString())
jvmArgumentProviders.add(
new LoggingFileArgumentProvider(
- loggingConfigFile: file("${resources}/logging.properties"),
- tempDir: testsTmpDir
+ loggingConfigFile: loggingConfigFile,
+ tempDir: tempDir
)
)
@@ -186,16 +188,16 @@ allprojects {
class LoggingFileArgumentProvider implements CommandLineArgumentProvider {
@InputFile
@PathSensitive(PathSensitivity.RELATIVE)
- File loggingConfigFile
+ RegularFile loggingConfigFile
@Internal
- File tempDir
+ Directory tempDir
@Override
Iterable<String> asArguments() {
[
- "-Djava.util.logging.config.file=$loggingConfigFile",
- "-DtempDir=$tempDir"
+ "-Djava.util.logging.config.file=${loggingConfigFile.getAsFile()}",
+ "-DtempDir=${tempDir.getAsFile()}"
]
}
}
diff --git a/gradle/testing/randomization.gradle b/gradle/testing/randomization.gradle
index 0a4839194fc..eb244a6ea21 100644
--- a/gradle/testing/randomization.gradle
+++ b/gradle/testing/randomization.gradle
@@ -36,22 +36,17 @@ buildscript {
class SecurityArgumentProvider implements CommandLineArgumentProvider {
@Internal
- File commonSolrDir
+ Directory commonSolrDir
@InputFile
@PathSensitive(PathSensitivity.RELATIVE)
- File javaSecurityPolicy
-
- SecurityArgumentProvider(File commonSolrDir, File javaSecurityPolicy) {
- this.commonSolrDir = commonSolrDir
- this.javaSecurityPolicy = javaSecurityPolicy
- }
+ RegularFile javaSecurityPolicy
@Override
Iterable<String> asArguments() {
[
- "-Dcommon-solr.dir=$commonSolrDir",
- "-Djava.security.policy=$javaSecurityPolicy"
+ "-Dcommon-solr.dir=${commonSolrDir.getAsFile()}",
+ "-Djava.security.policy=${javaSecurityPolicy.getAsFile()}"
]
}
}
@@ -206,9 +201,14 @@ allprojects {
// Enable security manager, if requested. We could move the selection of security manager and security policy
// to each project's build/ configuration but it seems compact enough to keep it here for now.
if (Boolean.parseBoolean(testOptionsResolved["tests.useSecurityManager"])) {
- def commonSolrDir = project(":solr").projectDir
- def javaSecurityPolicy = file("${resources}/policies/solr-tests.policy")
- jvmArgumentProviders.add(new SecurityArgumentProvider(commonSolrDir, javaSecurityPolicy))
+ def commonSolrDir = project(':solr').layout.projectDirectory
+ def javaSecurityPolicy = layout.projectDirectory.file("${resources}/policies/solr-tests.policy")
+ jvmArgumentProviders.add(
+ new SecurityArgumentProvider(
+ commonSolrDir: commonSolrDir,
+ javaSecurityPolicy: javaSecurityPolicy
+ )
+ )
systemProperty 'java.security.manager', "org.apache.lucene.tests.util.TestSecurityManager"
def gradleUserHome = project.gradle.getGradleUserHomeDir()