windows support: do not add crlf to test files. Also put testdata at …

…the toplevel so it is clear that testdata is not part of the source code
dropbox · Jun 11, 2018 · 80763e3 · 80763e3
1 parent a08934b
commit 80763e3
Show file tree

Hide file tree

Showing 52 changed files with 86 additions and 85 deletions.
diff --git a/src/bin/integration_tests.rs b/src/bin/integration_tests.rs
diff --git a/src/bin/tests.rs b/src/bin/tests.rs
@@ -95,7 +95,7 @@ fn test_10x_10y() {
 
 #[test]
 fn test_alice() {
-  let in_buf = include_bytes!("testdata/alice29.txt.compressed");
+  let in_buf = include_bytes!("../../testdata/alice29.txt.compressed");
 
   let mut output = Buffer::new(&[]);
   let mut input = super::BrotliDecompressor::new(Buffer::new(in_buf), 1);
@@ -104,7 +104,7 @@ fn test_alice() {
     Err(e) => panic!("Error {:?}", e),
   }
   let mut i: usize = 0;
-  let truth = include_bytes!("testdata/alice29.txt");
+  let truth = include_bytes!("../../testdata/alice29.txt");
   while i < truth.len() {
     assert_eq!(output.data[i], truth[i]);
     i += 1;

diff --git a/src/enc/test.rs b/src/enc/test.rs
@@ -289,47 +289,47 @@ macro_rules! test_roundtrip_file {
 
 #[test]
 fn test_roundtrip_64x() {
-  test_roundtrip_file!("../bin/testdata/64x", 72, 9, 10, 3, 2);
+  test_roundtrip_file!("../../testdata/64x", 72, 9, 10, 3, 2);
 }
 #[test]
 fn test_roundtrip_ukkonooa() {
-  test_roundtrip_file!("../bin/testdata/ukkonooa", 82, 9, 10, 3, 2);
+  test_roundtrip_file!("../../testdata/ukkonooa", 82, 9, 10, 3, 2);
 }
 #[test]
 fn test_roundtrip_backward65536() {
-  test_roundtrip_file!("../bin/testdata/backward65536", 72000, 9, 10, 3, 2);
+  test_roundtrip_file!("../../testdata/backward65536", 72000, 9, 10, 3, 2);
 }
 #[test]
 fn test_roundtrip_aaabaaaa() {
-  test_roundtrip_file!("../bin/testdata/aaabaaaa", 72000, 9, 10, 3, 2);
+  test_roundtrip_file!("../../testdata/aaabaaaa", 72000, 9, 10, 3, 2);
 }
 #[test]
 fn test_roundtrip_monkey() {
-  test_roundtrip_file!("../bin/testdata/monkey", 72000, 9, 10, 16, 15);
+  test_roundtrip_file!("../../testdata/monkey", 72000, 9, 10, 16, 15);
 }
 #[test]
 fn test_roundtrip_quickfox_repeated() {
-  test_roundtrip_file!("../bin/testdata/quickfox_repeated", 16384, 9, 10, 257, 255);
+  test_roundtrip_file!("../../testdata/quickfox_repeated", 16384, 9, 10, 257, 255);
 }
 
 #[test]
 fn test_roundtrip_asyoulik() {
-  test_roundtrip_file!("../bin/testdata/asyoulik.txt", 64384, 9, 15, 513, 511);
+  test_roundtrip_file!("../../testdata/asyoulik.txt", 64384, 9, 15, 513, 511);
 }
 
 #[test]
 fn test_roundtrip_asyoulik9_5() {
-  test_roundtrip_file!("../bin/testdata/asyoulik.txt", 62384, 10, 15, 513, 511);
+  test_roundtrip_file!("../../testdata/asyoulik.txt", 62384, 10, 15, 513, 511);
 }
 
 #[test]
 fn test_roundtrip_compressed() {
-  test_roundtrip_file!("../bin/testdata/compressed_file", 50400, 9, 10, 1025, 1024);
+  test_roundtrip_file!("../../testdata/compressed_file", 50400, 9, 10, 1025, 1024);
 }
 
 #[test]
 fn test_roundtrip_compressed_repeated() {
-  test_roundtrip_file!("../bin/testdata/compressed_repeated",
+  test_roundtrip_file!("../../testdata/compressed_repeated",
                        120000,
                        9,
                        16,
@@ -339,7 +339,7 @@ fn test_roundtrip_compressed_repeated() {
 
 #[test]
 fn test_roundtrip_quickfox() {
-  test_roundtrip_file!("../bin/testdata/quickfox", 256, 9, 10, 1, 2);
+  test_roundtrip_file!("../../testdata/quickfox", 256, 9, 10, 1, 2);
 }
 
 

diff --git a/testdata/.gitattributes b/testdata/.gitattributes
@@ -0,0 +1 @@
+* binary
diff --git a/src/bin/testdata/10x10y → testdata/10x10y b/src/bin/testdata/10x10y → testdata/10x10y
diff --git a/src/bin/testdata/64x → testdata/64x b/src/bin/testdata/64x → testdata/64x
diff --git a/src/bin/testdata/64x.compressed → testdata/64x.compressed b/src/bin/testdata/64x.compressed → testdata/64x.compressed
diff --git a/src/bin/testdata/aaabaaaa → testdata/aaabaaaa b/src/bin/testdata/aaabaaaa → testdata/aaabaaaa
diff --git a/src/bin/testdata/alice29.txt → testdata/alice29.txt b/src/bin/testdata/alice29.txt → testdata/alice29.txt
diff --git a/src/bin/testdata/alice29.txt.compressed → testdata/alice29.txt.compressed b/src/bin/testdata/alice29.txt.compressed → testdata/alice29.txt.compressed
diff --git a/src/bin/testdata/asyoulik.txt → testdata/asyoulik.txt b/src/bin/testdata/asyoulik.txt → testdata/asyoulik.txt
diff --git a/src/bin/testdata/asyoulik.txt.compressed → testdata/asyoulik.txt.compressed b/src/bin/testdata/asyoulik.txt.compressed → testdata/asyoulik.txt.compressed
diff --git a/src/bin/testdata/backward65536 → testdata/backward65536 b/src/bin/testdata/backward65536 → testdata/backward65536
diff --git a/src/bin/testdata/backward65536.compressed → testdata/backward65536.compressed b/src/bin/testdata/backward65536.compressed → testdata/backward65536.compressed
diff --git a/src/bin/testdata/compressed_file → testdata/compressed_file b/src/bin/testdata/compressed_file → testdata/compressed_file
diff --git a/src/bin/testdata/compressed_file.compressed → testdata/compressed_file.compressed b/src/bin/testdata/compressed_file.compressed → testdata/compressed_file.compressed
diff --git a/src/bin/testdata/compressed_repeated → testdata/compressed_repeated b/src/bin/testdata/compressed_repeated → testdata/compressed_repeated
diff --git a/...n/testdata/compressed_repeated.compressed → testdata/compressed_repeated.compressed b/...n/testdata/compressed_repeated.compressed → testdata/compressed_repeated.compressed
diff --git a/src/bin/testdata/empty → testdata/empty b/src/bin/testdata/empty → testdata/empty
diff --git a/src/bin/testdata/empty.compressed → testdata/empty.compressed b/src/bin/testdata/empty.compressed → testdata/empty.compressed
diff --git a/src/bin/testdata/empty.compressed.00 → testdata/empty.compressed.00 b/src/bin/testdata/empty.compressed.00 → testdata/empty.compressed.00
diff --git a/src/bin/testdata/empty.compressed.01 → testdata/empty.compressed.01 b/src/bin/testdata/empty.compressed.01 → testdata/empty.compressed.01
diff --git a/src/bin/testdata/empty.compressed.02 → testdata/empty.compressed.02 b/src/bin/testdata/empty.compressed.02 → testdata/empty.compressed.02
diff --git a/src/bin/testdata/empty.compressed.03 → testdata/empty.compressed.03 b/src/bin/testdata/empty.compressed.03 → testdata/empty.compressed.03
diff --git a/src/bin/testdata/empty.compressed.04 → testdata/empty.compressed.04 b/src/bin/testdata/empty.compressed.04 → testdata/empty.compressed.04
diff --git a/src/bin/testdata/empty.compressed.05 → testdata/empty.compressed.05 b/src/bin/testdata/empty.compressed.05 → testdata/empty.compressed.05
diff --git a/src/bin/testdata/empty.compressed.06 → testdata/empty.compressed.06 b/src/bin/testdata/empty.compressed.06 → testdata/empty.compressed.06
diff --git a/src/bin/testdata/empty.compressed.07 → testdata/empty.compressed.07 b/src/bin/testdata/empty.compressed.07 → testdata/empty.compressed.07
diff --git a/src/bin/testdata/empty.compressed.08 → testdata/empty.compressed.08 b/src/bin/testdata/empty.compressed.08 → testdata/empty.compressed.08
diff --git a/src/bin/testdata/empty.compressed.09 → testdata/empty.compressed.09 b/src/bin/testdata/empty.compressed.09 → testdata/empty.compressed.09
diff --git a/src/bin/testdata/empty.compressed.10 → testdata/empty.compressed.10 b/src/bin/testdata/empty.compressed.10 → testdata/empty.compressed.10
diff --git a/src/bin/testdata/empty.compressed.11 → testdata/empty.compressed.11 b/src/bin/testdata/empty.compressed.11 → testdata/empty.compressed.11
diff --git a/src/bin/testdata/empty.compressed.12 → testdata/empty.compressed.12 b/src/bin/testdata/empty.compressed.12 → testdata/empty.compressed.12
diff --git a/src/bin/testdata/empty.compressed.13 → testdata/empty.compressed.13 b/src/bin/testdata/empty.compressed.13 → testdata/empty.compressed.13
diff --git a/src/bin/testdata/empty.compressed.14 → testdata/empty.compressed.14 b/src/bin/testdata/empty.compressed.14 → testdata/empty.compressed.14
diff --git a/src/bin/testdata/empty.compressed.15 → testdata/empty.compressed.15 b/src/bin/testdata/empty.compressed.15 → testdata/empty.compressed.15
diff --git a/src/bin/testdata/empty.compressed.16 → testdata/empty.compressed.16 b/src/bin/testdata/empty.compressed.16 → testdata/empty.compressed.16
diff --git a/src/bin/testdata/empty.compressed.17 → testdata/empty.compressed.17 b/src/bin/testdata/empty.compressed.17 → testdata/empty.compressed.17
diff --git a/src/bin/testdata/empty.compressed.18 → testdata/empty.compressed.18 b/src/bin/testdata/empty.compressed.18 → testdata/empty.compressed.18
diff --git a/...n/testdata/ends_with_truncated_dictionary → testdata/ends_with_truncated_dictionary b/...n/testdata/ends_with_truncated_dictionary → testdata/ends_with_truncated_dictionary
diff --git a/src/bin/testdata/monkey → testdata/monkey b/src/bin/testdata/monkey → testdata/monkey
diff --git a/src/bin/testdata/quickfox → testdata/quickfox b/src/bin/testdata/quickfox → testdata/quickfox
diff --git a/src/bin/testdata/quickfox_repeated → testdata/quickfox_repeated b/src/bin/testdata/quickfox_repeated → testdata/quickfox_repeated
diff --git a/src/bin/testdata/random_org_10k.bin → testdata/random_org_10k.bin b/src/bin/testdata/random_org_10k.bin → testdata/random_org_10k.bin
diff --git a/src/bin/testdata/random_then_unicode → testdata/random_then_unicode b/src/bin/testdata/random_then_unicode → testdata/random_then_unicode
diff --git a/src/bin/testdata/ukkonooa → testdata/ukkonooa b/src/bin/testdata/ukkonooa → testdata/ukkonooa
diff --git a/src/bin/testdata/x → testdata/x b/src/bin/testdata/x → testdata/x
diff --git a/src/bin/testdata/x.compressed.00 → testdata/x.compressed.00 b/src/bin/testdata/x.compressed.00 → testdata/x.compressed.00
diff --git a/src/bin/testdata/x.compressed.01 → testdata/x.compressed.01 b/src/bin/testdata/x.compressed.01 → testdata/x.compressed.01
diff --git a/src/bin/testdata/x.compressed.02 → testdata/x.compressed.02 b/src/bin/testdata/x.compressed.02 → testdata/x.compressed.02
diff --git a/src/bin/testdata/x.compressed.03 → testdata/x.compressed.03 b/src/bin/testdata/x.compressed.03 → testdata/x.compressed.03
diff --git a/src/bin/testdata/xyzzy → testdata/xyzzy b/src/bin/testdata/xyzzy → testdata/xyzzy