Merge pull request #340 from liblit/assorted-gradle-test-fixes
Assorted Gradle test fixes
This commit is contained in:
commit
c40c7e34f0
|
@ -33,9 +33,9 @@ test {
|
||||||
exclude '**/FieldBasedJQueryTest.class'
|
exclude '**/FieldBasedJQueryTest.class'
|
||||||
}
|
}
|
||||||
|
|
||||||
task cleanTest(type: Delete) {
|
task cleanTestExtras(type: Delete) {
|
||||||
delete 'actual.dump'
|
delete 'actual.dump'
|
||||||
delete 'expected.dump'
|
delete 'expected.dump'
|
||||||
}
|
}
|
||||||
|
|
||||||
clean.dependsOn cleanTest
|
cleanTest.dependsOn cleanTestExtras
|
||||||
|
|
|
@ -45,8 +45,8 @@ test {
|
||||||
classpath += files project(':com.ibm.wala.core.testdata').sourceSets.test.java.outputDir
|
classpath += files project(':com.ibm.wala.core.testdata').sourceSets.test.java.outputDir
|
||||||
}
|
}
|
||||||
|
|
||||||
task cleanTest(type: Delete) {
|
task cleanTestExtras(type: Delete) {
|
||||||
delete 'report'
|
delete 'report'
|
||||||
}
|
}
|
||||||
|
|
||||||
clean.dependsOn cleanTest
|
cleanTest.dependsOn cleanTestExtras
|
||||||
|
|
|
@ -134,11 +134,7 @@ processTestResources {
|
||||||
from copyAndroidJar
|
from copyAndroidJar
|
||||||
from downloadSampleCup
|
from downloadSampleCup
|
||||||
from downloadSampleLex
|
from downloadSampleLex
|
||||||
|
from project(':com.ibm.wala.core.testdata').collectTestDataA
|
||||||
def testdata = project(':com.ibm.wala.core.testdata')
|
|
||||||
from testdata.collectJLex
|
|
||||||
from testdata.collectTestDataA
|
|
||||||
from testdata.downloadJavaCup
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isWindows)
|
if (isWindows)
|
||||||
|
@ -150,12 +146,12 @@ test {
|
||||||
maxHeapSize = '800M'
|
maxHeapSize = '800M'
|
||||||
}
|
}
|
||||||
|
|
||||||
task cleanTest(type: Delete) {
|
task cleanTestExtras(type: Delete) {
|
||||||
delete(
|
delete(
|
||||||
'parser.java',
|
'parser.java',
|
||||||
'report',
|
'report',
|
||||||
'sym.java',
|
'sym.java',
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
clean.dependsOn cleanTest
|
cleanTest.dependsOn cleanTestExtras
|
||||||
|
|
Loading…
Reference in New Issue