authorgravatar for igor.anic@gmail.comIgor Anić <igor.anic@gmail.com> 2023-12-12 18:35:42+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-01-13 19:37:33-07:00
loge21a12e56b21aee956132dd5f68bc2349ce37c1a
tree0518bf34bddabdce091460f171b6fb635d3a25a3
parent76fe1f53d5b9cfae100854afe495e8b378d2dc9e

tar: use @embedFile in tests

Like in other tests which uses testdata files (compress). That enables wasi testing also, was failing because file system operations in tests.

1 files changed, 32 insertions(+), 40 deletions(-)

lib/std/tar/test.zig+32-40
......@@ -4,8 +4,6 @@ const tar = std.tar;
44const assert = std.debug.assert;
55
66test "tar run Go test cases" {
7 if (builtin.os.tag == .wasi) return error.SkipZigTest;
8
97 const Case = struct {
108 const File = struct {
119 name: []const u8,
......@@ -16,18 +14,15 @@ test "tar run Go test cases" {
1614 truncated: bool = false, // when there is no file body, just header, usefull for huge files
1715 };
1816
19 path: []const u8, // path to the tar archive file on dis
17 data: []const u8, // testdata file content
2018 files: []const File = &[_]@This().File{}, // expected files to found in archive
21 chksums: []const []const u8 = &[_][]const u8{}, // chksums of files content
19 chksums: []const []const u8 = &[_][]const u8{}, // chksums of each file content
2220 err: ?anyerror = null, // parsing should fail with this error
2321 };
2422
25 const src_path = comptime std.fs.path.dirname(@src().file) orelse ".";
26 const test_dir = try std.fs.cwd().openDir(src_path ++ "/testdata", .{});
27
2823 const cases = [_]Case{
2924 .{
30 .path = "gnu.tar",
25 .data = @embedFile("testdata/gnu.tar"),
3126 .files = &[_]Case.File{
3227 .{
3328 .name = "small.txt",
......@@ -46,11 +41,11 @@ test "tar run Go test cases" {
4641 },
4742 },
4843 .{
49 .path = "sparse-formats.tar",
44 .data = @embedFile("testdata/sparse-formats.tar"),
5045 .err = error.TarUnsupportedHeader,
5146 },
5247 .{
53 .path = "star.tar",
48 .data = @embedFile("testdata/star.tar"),
5449 .files = &[_]Case.File{
5550 .{
5651 .name = "small.txt",
......@@ -69,7 +64,7 @@ test "tar run Go test cases" {
6964 },
7065 },
7166 .{
72 .path = "v7.tar",
67 .data = @embedFile("testdata/v7.tar"),
7368 .files = &[_]Case.File{
7469 .{
7570 .name = "small.txt",
......@@ -88,7 +83,7 @@ test "tar run Go test cases" {
8883 },
8984 },
9085 .{
91 .path = "pax.tar",
86 .data = @embedFile("testdata/pax.tar"),
9287 .files = &[_]Case.File{
9388 .{
9489 .name = "a/123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100",
......@@ -109,12 +104,12 @@ test "tar run Go test cases" {
109104 },
110105 .{
111106 // pax attribute don't end with \n
112 .path = "pax-bad-hdr-file.tar",
107 .data = @embedFile("testdata/pax-bad-hdr-file.tar"),
113108 .err = error.PaxInvalidAttributeEnd,
114109 },
115110 .{
116111 // size is in pax attribute
117 .path = "pax-pos-size-file.tar",
112 .data = @embedFile("testdata/pax-pos-size-file.tar"),
118113 .files = &[_]Case.File{
119114 .{
120115 .name = "foo",
......@@ -129,7 +124,7 @@ test "tar run Go test cases" {
129124 },
130125 .{
131126 // has pax records which we are not interested in
132 .path = "pax-records.tar",
127 .data = @embedFile("testdata/pax-records.tar"),
133128 .files = &[_]Case.File{
134129 .{
135130 .name = "file",
......@@ -138,7 +133,7 @@ test "tar run Go test cases" {
138133 },
139134 .{
140135 // has global records which we are ignoring
141 .path = "pax-global-records.tar",
136 .data = @embedFile("testdata/pax-global-records.tar"),
142137 .files = &[_]Case.File{
143138 .{
144139 .name = "file1",
......@@ -155,7 +150,7 @@ test "tar run Go test cases" {
155150 },
156151 },
157152 .{
158 .path = "nil-uid.tar",
153 .data = @embedFile("testdata/nil-uid.tar"),
159154 .files = &[_]Case.File{
160155 .{
161156 .name = "P1050238.JPG.log",
......@@ -170,7 +165,7 @@ test "tar run Go test cases" {
170165 },
171166 .{
172167 // has xattrs and pax records which we are ignoring
173 .path = "xattrs.tar",
168 .data = @embedFile("testdata/xattrs.tar"),
174169 .files = &[_]Case.File{
175170 .{
176171 .name = "small.txt",
......@@ -191,7 +186,7 @@ test "tar run Go test cases" {
191186 },
192187 },
193188 .{
194 .path = "gnu-multi-hdrs.tar",
189 .data = @embedFile("testdata/gnu-multi-hdrs.tar"),
195190 .files = &[_]Case.File{
196191 .{
197192 .name = "GNU2/GNU2/long-path-name",
......@@ -202,12 +197,12 @@ test "tar run Go test cases" {
202197 },
203198 .{
204199 // has gnu type D (directory) and S (sparse) blocks
205 .path = "gnu-incremental.tar",
200 .data = @embedFile("testdata/gnu-incremental.tar"),
206201 .err = error.TarUnsupportedHeader,
207202 },
208203 .{
209204 // should use values only from last pax header
210 .path = "pax-multi-hdrs.tar",
205 .data = @embedFile("testdata/pax-multi-hdrs.tar"),
211206 .files = &[_]Case.File{
212207 .{
213208 .name = "bar",
......@@ -217,7 +212,7 @@ test "tar run Go test cases" {
217212 },
218213 },
219214 .{
220 .path = "gnu-long-nul.tar",
215 .data = @embedFile("testdata/gnu-long-nul.tar"),
221216 .files = &[_]Case.File{
222217 .{
223218 .name = "0123456789",
......@@ -226,7 +221,7 @@ test "tar run Go test cases" {
226221 },
227222 },
228223 .{
229 .path = "gnu-utf8.tar",
224 .data = @embedFile("testdata/gnu-utf8.tar"),
230225 .files = &[_]Case.File{
231226 .{
232227 .name = "☺☻☹☺☻☹☺☻☹☺☻☹☺☻☹☺☻☹☺☻☹☺☻☹☺☻☹☺☻☹☺☻☹☺☻☹☺☻☹☺☻☹☺☻☹☺☻☹☺☻☹☺☻☹",
......@@ -235,7 +230,7 @@ test "tar run Go test cases" {
235230 },
236231 },
237232 .{
238 .path = "gnu-not-utf8.tar",
233 .data = @embedFile("testdata/gnu-not-utf8.tar"),
239234 .files = &[_]Case.File{
240235 .{
241236 .name = "hi\x80\x81\x82\x83bye",
......@@ -245,32 +240,32 @@ test "tar run Go test cases" {
245240 },
246241 .{
247242 // null in pax key
248 .path = "pax-nul-xattrs.tar",
243 .data = @embedFile("testdata/pax-nul-xattrs.tar"),
249244 .err = error.PaxNullInKeyword,
250245 },
251246 .{
252 .path = "pax-nul-path.tar",
247 .data = @embedFile("testdata/pax-nul-path.tar"),
253248 .err = error.PaxNullInValue,
254249 },
255250 .{
256 .path = "neg-size.tar",
251 .data = @embedFile("testdata/neg-size.tar"),
257252 .err = error.TarHeader,
258253 },
259254 .{
260 .path = "issue10968.tar",
255 .data = @embedFile("testdata/issue10968.tar"),
261256 .err = error.TarHeader,
262257 },
263258 .{
264 .path = "issue11169.tar",
259 .data = @embedFile("testdata/issue11169.tar"),
265260 .err = error.TarHeader,
266261 },
267262 .{
268 .path = "issue12435.tar",
263 .data = @embedFile("testdata/issue12435.tar"),
269264 .err = error.TarHeaderChksum,
270265 },
271266 .{
272267 // has magic with space at end instead of null
273 .path = "invalid-go17.tar",
268 .data = @embedFile("testdata/invalid-go17.tar"),
274269 .files = &[_]Case.File{
275270 .{
276271 .name = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/foo",
......@@ -278,7 +273,7 @@ test "tar run Go test cases" {
278273 },
279274 },
280275 .{
281 .path = "ustar-file-devs.tar",
276 .data = @embedFile("testdata/ustar-file-devs.tar"),
282277 .files = &[_]Case.File{
283278 .{
284279 .name = "file",
......@@ -287,7 +282,7 @@ test "tar run Go test cases" {
287282 },
288283 },
289284 .{
290 .path = "trailing-slash.tar",
285 .data = @embedFile("testdata/trailing-slash.tar"),
291286 .files = &[_]Case.File{
292287 .{
293288 .name = "123456789/" ** 30,
......@@ -297,7 +292,7 @@ test "tar run Go test cases" {
297292 },
298293 .{
299294 // Has size in gnu extended format. To represent size bigger than 8 GB.
300 .path = "writer-big.tar",
295 .data = @embedFile("testdata/writer-big.tar"),
301296 .files = &[_]Case.File{
302297 .{
303298 .name = "tmp/16gig.txt",
......@@ -309,7 +304,7 @@ test "tar run Go test cases" {
309304 },
310305 .{
311306 // Size in gnu extended format, and name in pax attribute.
312 .path = "writer-big-long.tar",
307 .data = @embedFile("testdata/writer-big-long.tar"),
313308 .files = &[_]Case.File{
314309 .{
315310 .name = "longname/" ** 15 ++ "16gig.txt",
......@@ -322,11 +317,8 @@ test "tar run Go test cases" {
322317 };
323318
324319 for (cases) |case| {
325 var fs_file = try test_dir.openFile(case.path, .{});
326
327 defer fs_file.close();
328
329 var iter = tar.tarReader(fs_file.reader(), null);
320 var fsb = std.io.fixedBufferStream(case.data);
321 var iter = tar.tarReader(fsb.reader(), null);
330322 var i: usize = 0;
331323 while (iter.next() catch |err| {
332324 if (case.err) |e| {