Merge pull request #340 from liblit/assorted-gradle-test-fixes

Assorted Gradle test fixes

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

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

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)
@@ -150,12 +146,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