Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert test module changes 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1897355 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2022-01-22 21:34:35 +00:00
parent 1ee199b1ea
commit e71e602762
5 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
poi-excelant/build.gradle
View File

@ -154,7 +154,7 @@ task testJar(type: Jar, dependsOn: [ testClasses, cacheTest9 ] ) {
}
}
from sourceSets.test.output
from sourceSets.test.output + sourceSets.main.output
manifest {
attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
@ -172,14 +172,12 @@ test {
jvmArgs += [
"-javaagent:${OOXML_LITE_AGENT}=${OOXML_LITE_REPORT}|${OOXML_LITE_INCLUDES}",
]
/*
if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
jvmArgs += [
'--add-modules', MODULE_NAME,
'--module-path', '../build/dist/maven/poi-excelant-tests' + File.pathSeparator + files(TEST_MODULE_PATH).asPath,
]
}
*/
}
}

4
poi-integration/build.gradle
View File

@ -147,7 +147,7 @@ task testJar(type: Jar, dependsOn: [ testClasses, cacheTest9 ] ) {
}
}
from sourceSets.test.output
from sourceSets.test.output + sourceSets.main.output
manifest {
attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
@ -170,14 +170,12 @@ test {
jvmArgs += [
"-javaagent:${OOXML_LITE_AGENT}=${OOXML_LITE_REPORT}|${OOXML_LITE_INCLUDES}",
]
/*
if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
jvmArgs += [
'--add-modules', MODULE_NAME,
'--module-path', '../build/dist/maven/poi-integration-tests' + File.pathSeparator + files(MODULE_RUNTIME_PATH).asPath,
]
}
*/
if (NO_SCRATCHPAD) {
systemProperty 'scratchpad.ignore', 'true'
}

5
poi-ooxml/build.gradle
View File

@ -204,7 +204,6 @@ task compileTest9(type: JavaCompile) {
destinationDirectory = file(TEST9_OUT + VERSIONS9)
source = file(TEST9_SRC)
options.compilerArgs = [
'--patch-module', "org.apache.poi.poi=${projectDir}/../poi/build/classes/java/main",
'--patch-module', "${MODULE_NAME}=${(sourceSets.main.output.classesDirs + sourceSets.test.output.classesDirs).asPath}",
'--module-path', files(TEST_MODULE_PATH).asPath
]
@ -248,7 +247,7 @@ task testJar(type: Jar, dependsOn: testClasses) {
}
}
from sourceSets.test.output
from sourceSets.test.output + sourceSets.main.output
manifest {
attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
@ -321,14 +320,12 @@ test {
"-XX:ErrorFile=../build/hs_err_pid%p.log",
"-javaagent:${OOXML_LITE_AGENT}=${OOXML_LITE_REPORT}|${OOXML_LITE_INCLUDES}"
]
/*
if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
jvmArgs += [
'--add-modules', MODULE_NAME,
'--module-path', '../build/dist/maven/poi-ooxml-tests' + File.pathSeparator + files(TEST_MODULE_PATH).asPath,
]
}
*/
}
}

7
poi-scratchpad/build.gradle
View File

@ -90,7 +90,6 @@ task compileTest9(type: JavaCompile) {
destinationDirectory = file(TEST9_OUT + VERSIONS9)
source = file(TEST9_SRC)
options.compilerArgs = [
'--patch-module', "org.apache.poi.poi=${projectDir}/../poi/build/classes/java/main",
'--patch-module', "${MODULE_NAME}=${(sourceSets.main.output.classesDirs + sourceSets.test.output.classesDirs).asPath}",
'--module-path', files(TEST_MODULE_PATH).asPath
]
@ -134,7 +133,7 @@ task testJar(type: Jar, dependsOn: testClasses) {
}
}
from sourceSets.test.output
from sourceSets.test.output + sourceSets.main.output
manifest {
attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
@ -176,16 +175,14 @@ test {
systemProperties['junit.jupiter.execution.parallel.enabled'] = 'true'
/*
doFirst {
if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
jvmArgs += [
'--add-modules', MODULE_NAME,
'--module-path', '${projectDir}/../build/dist/maven/poi-scratchpad-tests' + File.pathSeparator + files(TEST_MODULE_PATH).asPath,
'--module-path', '../build/dist/maven/poi-scratchpad-tests' + File.pathSeparator + files(TEST_MODULE_PATH).asPath,
]
}
}
*/
}
publishing {

2
poi/build.gradle
View File

@ -162,7 +162,7 @@ task testJar(type: Jar, dependsOn: [ testClasses, cacheTest9 ]) {
}
}
from sourceSets.test.output
from sourceSets.test.output + sourceSets.main.output
manifest {
attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')