From 8146db20ffcb06803591996f8287247033f0fdb4 Mon Sep 17 00:00:00 2001
From: Ben Liblit <liblit@cs.wisc.edu>
Date: Mon, 21 May 2018 16:12:03 -0500
Subject: [PATCH] Remove git ignore patterns for several revision-tracked files

Someone may have thought that we were ignoring these files, but we
aren't.  From what I can tell, for these specific files, revision
tracking is intentional.
---
 .gitignore                                    | 3 ---
 com.ibm.wala.core.testdata/build.gradle       | 5 ++++-
 com.ibm.wala.core.testdata/classes/.gitignore | 1 +
 com.ibm.wala.core.testdata/ocaml/.gitignore   | 3 +++
 4 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 com.ibm.wala.core.testdata/classes/.gitignore
 create mode 100644 com.ibm.wala.core.testdata/ocaml/.gitignore

diff --git a/.gitignore b/.gitignore
index 5979e6a6e..69a3b6f13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,8 +36,6 @@ com.ibm.wala.cast/lib/
 com.ibm.wala.core.testdata/*.jar
 com.ibm.wala.core.testdata/@dot/
 com.ibm.wala.core.testdata/lib/
-com.ibm.wala.core.testdata/ocaml/
-com.ibm.wala.core.tests/dat/wala.examples.properties
 com.ibm.wala.core.tests/report
 com.ibm.wala.core/@dot
 com.ibm.wala.core/com.ibm.wala.core*.jar
@@ -46,7 +44,6 @@ com.ibm.wala.dalvik.test/data/sample.cup
 com.ibm.wala.dalvik.test/parser.java
 com.ibm.wala.dalvik.test/report
 com.ibm.wala.dalvik.test/sym.java
-com.ibm.wala.dalvik/src/logback.xml
 com.ibm.wala.ide.jdt.test/testdata/
 edu.kit.wala.smali.test/out/
 results
diff --git a/com.ibm.wala.core.testdata/build.gradle b/com.ibm.wala.core.testdata/build.gradle
index 58f685aa2..007f58794 100644
--- a/com.ibm.wala.core.testdata/build.gradle
+++ b/com.ibm.wala.core.testdata/build.gradle
@@ -115,7 +115,10 @@ task generateHelloHashJar(type: JavaExec, dependsOn: unpackOcamlJava) {
 
 task cleanGenerateHelloHashJar(type: Delete) {
 	delete generateHelloHashJar
-	delete fileTree('ocaml') { exclude '*.ml' }
+	delete fileTree('ocaml') {
+		exclude '*.ml'
+		exclude '.gitignore'
+	}
 }
 
 clean.dependsOn cleanGenerateHelloHashJar
diff --git a/com.ibm.wala.core.testdata/classes/.gitignore b/com.ibm.wala.core.testdata/classes/.gitignore
new file mode 100644
index 000000000..a3f6283ee
--- /dev/null
+++ b/com.ibm.wala.core.testdata/classes/.gitignore
@@ -0,0 +1 @@
+!/*.class
diff --git a/com.ibm.wala.core.testdata/ocaml/.gitignore b/com.ibm.wala.core.testdata/ocaml/.gitignore
new file mode 100644
index 000000000..6c115a46c
--- /dev/null
+++ b/com.ibm.wala.core.testdata/ocaml/.gitignore
@@ -0,0 +1,3 @@
+/hello_hash.cmi
+/hello_hash.cmj
+/hello_hash.jo