From d9f7abdad3972a75878a7bdc73f3e37c513609f3 Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Sat, 11 Aug 2018 12:36:22 -0500 Subject: [PATCH 1/2] Augment cleanTest tasks rather than replacing them Previously I hadn't realized that Gradle's "java" plugin would generate default "cleanTest" tasks for us. By defining my own "cleanTest" tasks we were replacing the generated ones, but what we really wanted to do was augment them with additional files to delete. --- com.ibm.wala.cast.js.rhino.test/build.gradle | 4 ++-- com.ibm.wala.core.tests/build.gradle | 4 ++-- com.ibm.wala.dalvik.test/build.gradle | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/com.ibm.wala.cast.js.rhino.test/build.gradle b/com.ibm.wala.cast.js.rhino.test/build.gradle index 21ad888b3..1a87cc44d 100644 --- a/com.ibm.wala.cast.js.rhino.test/build.gradle +++ b/com.ibm.wala.cast.js.rhino.test/build.gradle @@ -33,9 +33,9 @@ test { exclude '**/FieldBasedJQueryTest.class' } -task cleanTest(type: Delete) { +task cleanTestExtras(type: Delete) { delete 'actual.dump' delete 'expected.dump' } -clean.dependsOn cleanTest +cleanTest.dependsOn cleanTestExtras diff --git a/com.ibm.wala.core.tests/build.gradle b/com.ibm.wala.core.tests/build.gradle index 9b356cb96..8120adf90 100644 --- a/com.ibm.wala.core.tests/build.gradle +++ b/com.ibm.wala.core.tests/build.gradle @@ -45,8 +45,8 @@ test { classpath += files project(':com.ibm.wala.core.testdata').sourceSets.test.java.outputDir } -task cleanTest(type: Delete) { +task cleanTestExtras(type: Delete) { delete 'report' } -clean.dependsOn cleanTest +cleanTest.dependsOn cleanTestExtras diff --git a/com.ibm.wala.dalvik.test/build.gradle b/com.ibm.wala.dalvik.test/build.gradle index 8aacf1445..28ba3dbb9 100644 --- a/com.ibm.wala.dalvik.test/build.gradle +++ b/com.ibm.wala.dalvik.test/build.gradle @@ -150,12 +150,12 @@ test { maxHeapSize = '800M' } -task cleanTest(type: Delete) { +task cleanTestExtras(type: Delete) { delete( - 'parser.java', - 'report', - 'sym.java', - ) + 'parser.java', + 'report', + 'sym.java', + ) } -clean.dependsOn cleanTest +cleanTest.dependsOn cleanTestExtras From 32795455fbaf692a84165f1c3c42924eea095dbd Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Sat, 11 Aug 2018 12:40:44 -0500 Subject: [PATCH 2/2] Avoid redundant copying of some test resources These specific test resources are already included in the "testArchives" configuration of the "com.ibm.wala.core.tests" subproject, upon which the "com.ibm.wala.dalvik.test" tests already depend. So there's no need to also copy these resources into the "com.ibm.wala.dalvik.test" test resources area as well. --- com.ibm.wala.dalvik.test/build.gradle | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/com.ibm.wala.dalvik.test/build.gradle b/com.ibm.wala.dalvik.test/build.gradle index 28ba3dbb9..55e92f9b5 100644 --- a/com.ibm.wala.dalvik.test/build.gradle +++ b/com.ibm.wala.dalvik.test/build.gradle @@ -134,11 +134,7 @@ processTestResources { from copyAndroidJar from downloadSampleCup from downloadSampleLex - - def testdata = project(':com.ibm.wala.core.testdata') - from testdata.collectJLex - from testdata.collectTestDataA - from testdata.downloadJavaCup + from project(':com.ibm.wala.core.testdata').collectTestDataA } if (isWindows)