Test: Move flag to painless tests (#24494)

The `-XX:-OmitStackTraceInFastThrow` flag is only required by Painless's
tests so we'll only set it there. This is much simpler.
This commit is contained in:
Nik Everett 2017-05-04 13:11:09 -04:00 committed by GitHub
parent 6002b41b5f
commit 9bc7e210a0
2 changed files with 5 additions and 14 deletions

View File

@ -468,18 +468,7 @@ class BuildPlugin implements Plugin<Project> {
File heapdumpDir = new File(project.buildDir, 'heapdump')
heapdumpDir.mkdirs()
jvmArg '-XX:HeapDumpPath=' + heapdumpDir
/*
* We only want to append -XX:-OmitStackTraceInFastThrow if a flag for OmitStackTraceInFastThrow is not already included in
* tests.jvm.argline.
*/
final String testsJvmArgline = System.getProperty('tests.jvm.argline')
if (testsJvmArgline == null) {
argLine '-XX:-OmitStackTraceInFastThrow'
} else if (testsJvmArgline.indexOf("OmitStackTraceInFastThrow") < 0) {
argLine testsJvmArgline.trim() + ' ' + '-XX:-OmitStackTraceInFastThrow'
} else {
argLine testsJvmArgline.trim()
}
argLine System.getProperty('tests.jvm.argline')
// we use './temp' since this is per JVM and tests are forbidden from writing to CWD
systemProperty 'java.io.tmpdir', './temp'

View File

@ -33,6 +33,10 @@ dependencyLicenses {
mapping from: /asm-.*/, to: 'asm'
}
test {
jvmArg '-XX:-OmitStackTraceInFastThrow'
}
integTestCluster {
setting 'script.max_compilations_per_minute', '1000'
}
@ -146,5 +150,3 @@ task regen {
}
}
}