Merge pull request #13999 from ziglang/gitattributes

Update gitattributes and re-enable std lib compression test on Windows

9 files changed, 6 insertions, 11 deletions

diff --git a/lib/std/compress/deflate/huffman_bit_writer.zig b/lib/std/compress/deflate/huffman_bit_writer.zig
index 3b83eecea3..fc5727ca63 100644
--- a/lib/std/compress/deflate/huffman_bit_writer.zig
+++ b/lib/std/compress/deflate/huffman_bit_writer.zig
@@ -848,11 +848,6 @@ test "writeBlockHuff" {
     // Tests huffman encoding against reference files to detect possible regressions.
     // If encoding/bit allocation changes you can regenerate these files
 
-    if (builtin.os.tag == .windows) {
-        // https://github.com/ziglang/zig/issues/13892
-        return error.SkipZigTest;
-    }
-
     try testBlockHuff(
         "huffman-null-max.input",
         "huffman-null-max.golden",
diff --git a/lib/std/compress/gzip.zig b/lib/std/compress/gzip.zig
index c3b2335a1a..d7a2cb0094 100644
--- a/lib/std/compress/gzip.zig
+++ b/lib/std/compress/gzip.zig
@@ -172,8 +172,8 @@ fn testReader(data: []const u8, comptime expected: []const u8) !void {
 // SHA256=164ef0897b4cbec63abf1b57f069f3599bd0fb7c72c2a4dee21bd7e03ec9af67
 test "compressed data" {
     try testReader(
-        @embedFile("rfc1952.txt.gz"),
-        @embedFile("rfc1952.txt"),
+        @embedFile("testdata/rfc1952.txt.gz"),
+        @embedFile("testdata/rfc1952.txt"),
     );
 }
 
diff --git a/lib/std/compress/rfc1951.txt b/lib/std/compress/testdata/rfc1951.txt
index 403c8c722f..403c8c722f 100644
--- a/lib/std/compress/rfc1951.txt
+++ b/lib/std/compress/testdata/rfc1951.txt
diff --git a/lib/std/compress/rfc1951.txt.fixed.z.9 b/lib/std/compress/testdata/rfc1951.txt.fixed.z.9
index 8ea5904770..8ea5904770 100644
--- a/lib/std/compress/rfc1951.txt.fixed.z.9
+++ b/lib/std/compress/testdata/rfc1951.txt.fixed.z.9
diff --git a/lib/std/compress/rfc1951.txt.z.0 b/lib/std/compress/testdata/rfc1951.txt.z.0
index 3f50fb68f8..3f50fb68f8 100644
--- a/lib/std/compress/rfc1951.txt.z.0
+++ b/lib/std/compress/testdata/rfc1951.txt.z.0
diff --git a/lib/std/compress/rfc1951.txt.z.9 b/lib/std/compress/testdata/rfc1951.txt.z.9
index 84e7cbe5b7..84e7cbe5b7 100644
--- a/lib/std/compress/rfc1951.txt.z.9
+++ b/lib/std/compress/testdata/rfc1951.txt.z.9
diff --git a/lib/std/compress/rfc1952.txt b/lib/std/compress/testdata/rfc1952.txt
index a8e51b4567..a8e51b4567 100644
--- a/lib/std/compress/rfc1952.txt
+++ b/lib/std/compress/testdata/rfc1952.txt
diff --git a/lib/std/compress/rfc1952.txt.gz b/lib/std/compress/testdata/rfc1952.txt.gz
index be43b90a79..be43b90a79 100644
--- a/lib/std/compress/rfc1952.txt.gz
+++ b/lib/std/compress/testdata/rfc1952.txt.gz
diff --git a/lib/std/compress/zlib.zig b/lib/std/compress/zlib.zig
index 500bb0bb5b..0fc96a5aa9 100644
--- a/lib/std/compress/zlib.zig
+++ b/lib/std/compress/zlib.zig
@@ -107,21 +107,21 @@ fn testReader(data: []const u8, expected: []const u8) !void {
 // https://tools.ietf.org/rfc/rfc1951.txt length=36944 bytes
 // SHA256=5ebf4b5b7fe1c3a0c0ab9aa3ac8c0f3853a7dc484905e76e03b0b0f301350009
 test "compressed data" {
-    const rfc1951_txt = @embedFile("rfc1951.txt");
+    const rfc1951_txt = @embedFile("testdata/rfc1951.txt");
 
     // Compressed with compression level = 0
     try testReader(
-        @embedFile("rfc1951.txt.z.0"),
+        @embedFile("testdata/rfc1951.txt.z.0"),
         rfc1951_txt,
     );
     // Compressed with compression level = 9
     try testReader(
-        @embedFile("rfc1951.txt.z.9"),
+        @embedFile("testdata/rfc1951.txt.z.9"),
         rfc1951_txt,
     );
     // Compressed with compression level = 9 and fixed Huffman codes
     try testReader(
-        @embedFile("rfc1951.txt.fixed.z.9"),
+        @embedFile("testdata/rfc1951.txt.fixed.z.9"),
         rfc1951_txt,
     );
 }