summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorHung Nguyen <hungnv@google.com>2017-04-18 18:09:42 -0700
committerHung Nguyen <hungnv@google.com>2017-04-20 16:35:19 -0700
commitd9a9fa827cfa766e83afbe5be81fcd3b96a24f72 (patch)
treecf2db634cc0ca3aa683de4bee5824c0d6fe1050f /src/test
parent2114d2f8f540b6634c9431d80adac4960fefba07 (diff)
downloadapkzlib-d9a9fa827cfa766e83afbe5be81fcd3b96a24f72.tar.gz
Fix ZipToolsTest failing on Windows.
During a git checkout on Windows, \r characters might have been inserted into the files' contents, resulting in incorrect file comparison (currently found in ZipToolsTest). We need to suppress this behavior for test files whose contents should not change. Test: Rerun ZipToolsTest on Windows and make sure it passes Change-Id: Ic6e152451ab22264fc796f9afe38d3af4f9349cb
Diffstat (limited to 'src/test')
-rw-r--r--src/test/resources/testData/packaging/text-files/.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/resources/testData/packaging/text-files/.gitattributes b/src/test/resources/testData/packaging/text-files/.gitattributes
new file mode 100644
index 0000000..fa1385d
--- /dev/null
+++ b/src/test/resources/testData/packaging/text-files/.gitattributes
@@ -0,0 +1 @@
+* -text