From fca0f7c1170b2d9a0db2047e86eb679f824593d9 Mon Sep 17 00:00:00 2001
From: Ben Liblit <liblit@cs.wisc.edu>
Date: Wed, 14 Feb 2018 20:04:58 -0600
Subject: [PATCH] Fix jar exclusion patterns to match what Ant uses

One previously-failing test class now passes.  Progress!
---
 com.ibm.wala.core.testdata/build.gradle | 19 +++++++------------
 com.ibm.wala.core.tests/build.gradle    |  1 -
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/com.ibm.wala.core.testdata/build.gradle b/com.ibm.wala.core.testdata/build.gradle
index 311e8a82a..7a3c89b88 100644
--- a/com.ibm.wala.core.testdata/build.gradle
+++ b/com.ibm.wala.core.testdata/build.gradle
@@ -145,7 +145,7 @@ task collectTestData(type: Jar) {
 	archiveName "${baseName}_${version}.${extension}"
 	from compileTestJava
 	from 'classes'
-	exclude 'methodLookup'
+	includeEmptyDirs false
 	destinationDir projectDir
 }
 
@@ -166,18 +166,13 @@ task collectTestDataA(type: Jar) {
 	archiveName "${baseName}_${version}.${extension}"
 	from compileTestJava
 	from 'classes'
-	exclude (
-		'annotations/Foo*',
-		'annotations/Outer*',
-		'annotations/Type*',
-		'bug144/*',
-		'CodeDeleted.class',
-		'defaultMethods/*',
-		'methodLookup',
-		'lambda/*',
-		'special/*',
-		)
+	includeEmptyDirs false
 	destinationDir projectDir
+	exclude (
+		'**/CodeDeleted.class',
+		'**/SortingExample.class',
+		'**/A.class',
+		)
 }
 
 task cleanColllectTestDataA(type: Delete) {
diff --git a/com.ibm.wala.core.tests/build.gradle b/com.ibm.wala.core.tests/build.gradle
index 36702b352..51eeacf07 100644
--- a/com.ibm.wala.core.tests/build.gradle
+++ b/com.ibm.wala.core.tests/build.gradle
@@ -40,7 +40,6 @@ test {
 
 	// https://github.com/liblit/WALA/issues/5
 	exclude '**/DynamicCallGraphTest.class'
-	exclude '**/GetTargetsTest.class'
 	exclude '**/PruneArrayOutOfBoundExceptionEdge.class'
 }