authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-07-31 22:01:26+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-08-01 09:06:56+02:00
log0ce56f93052184e5c0f627f6af1ff4d34bb3110a
treec0050cfe5968a437b17bfbf9b9718e16b7d04cdf
parent58bc713c171e74b3c4f8283636561e6521edbeef

macho: fix Trie and CodeSignature unit tests

after the cleanup.

2 files changed, 27 insertions(+), 27 deletions(-)

src/link/MachO/CodeSignature.zig+2-2
......@@ -163,8 +163,8 @@ fn writeBlobIndex(tt: u32, offset: u32, writer: anytype) !void {
163163}
164164
165165test "CodeSignature header" {
166 var code_sig = CodeSignature.init(testing.allocator, 0x1000);
167 defer code_sig.deinit();
166 var code_sig: CodeSignature = .{};
167 defer code_sig.deinit(testing.allocator);
168168
169169 var buffer: [@sizeOf(macho.SuperBlob)]u8 = undefined;
170170 var stream = std.io.fixedBufferStream(&buffer);
src/link/MachO/Trie.zig+25-25
......@@ -361,9 +361,9 @@ const ReadError = error{
361361};
362362
363363/// Parse the trie from a byte stream.
364pub fn read(self: *Trie, reader: anytype) ReadError!usize {
365 try self.createRoot();
366 return self.root.?.read(self.allocator, reader);
364pub fn read(self: *Trie, allocator: *Allocator, reader: anytype) ReadError!usize {
365 try self.createRoot(allocator);
366 return self.root.?.read(allocator, reader);
367367}
368368
369369/// Write the trie to a byte stream.
......@@ -396,13 +396,13 @@ fn createRoot(self: *Trie, allocator: *Allocator) !void {
396396
397397test "Trie node count" {
398398 var gpa = testing.allocator;
399 var trie = Trie.init(gpa);
400 defer trie.deinit();
399 var trie: Trie = .{};
400 defer trie.deinit(gpa);
401401
402402 try testing.expectEqual(trie.node_count, 0);
403403 try testing.expect(trie.root == null);
404404
405 try trie.put(.{
405 try trie.put(gpa, .{
406406 .name = "_main",
407407 .vmaddr_offset = 0,
408408 .export_flags = 0,
......@@ -410,14 +410,14 @@ test "Trie node count" {
410410 try testing.expectEqual(trie.node_count, 2);
411411
412412 // Inserting the same node shouldn't update the trie.
413 try trie.put(.{
413 try trie.put(gpa, .{
414414 .name = "_main",
415415 .vmaddr_offset = 0,
416416 .export_flags = 0,
417417 });
418418 try testing.expectEqual(trie.node_count, 2);
419419
420 try trie.put(.{
420 try trie.put(gpa, .{
421421 .name = "__mh_execute_header",
422422 .vmaddr_offset = 0x1000,
423423 .export_flags = 0,
......@@ -425,13 +425,13 @@ test "Trie node count" {
425425 try testing.expectEqual(trie.node_count, 4);
426426
427427 // Inserting the same node shouldn't update the trie.
428 try trie.put(.{
428 try trie.put(gpa, .{
429429 .name = "__mh_execute_header",
430430 .vmaddr_offset = 0x1000,
431431 .export_flags = 0,
432432 });
433433 try testing.expectEqual(trie.node_count, 4);
434 try trie.put(.{
434 try trie.put(gpa, .{
435435 .name = "_main",
436436 .vmaddr_offset = 0,
437437 .export_flags = 0,
......@@ -441,11 +441,11 @@ test "Trie node count" {
441441
442442test "Trie basic" {
443443 var gpa = testing.allocator;
444 var trie = Trie.init(gpa);
445 defer trie.deinit();
444 var trie: Trie = .{};
445 defer trie.deinit(gpa);
446446
447447 // root --- _st ---> node
448 try trie.put(.{
448 try trie.put(gpa, .{
449449 .name = "_st",
450450 .vmaddr_offset = 0,
451451 .export_flags = 0,
......@@ -455,7 +455,7 @@ test "Trie basic" {
455455
456456 {
457457 // root --- _st ---> node --- art ---> node
458 try trie.put(.{
458 try trie.put(gpa, .{
459459 .name = "_start",
460460 .vmaddr_offset = 0,
461461 .export_flags = 0,
......@@ -471,7 +471,7 @@ test "Trie basic" {
471471 // root --- _ ---> node --- st ---> node --- art ---> node
472472 // |
473473 // | --- main ---> node
474 try trie.put(.{
474 try trie.put(gpa, .{
475475 .name = "_main",
476476 .vmaddr_offset = 0,
477477 .export_flags = 0,
......@@ -491,22 +491,22 @@ test "Trie basic" {
491491
492492test "write Trie to a byte stream" {
493493 var gpa = testing.allocator;
494 var trie = Trie.init(gpa);
495 defer trie.deinit();
494 var trie: Trie = .{};
495 defer trie.deinit(gpa);
496496
497 try trie.put(.{
497 try trie.put(gpa, .{
498498 .name = "__mh_execute_header",
499499 .vmaddr_offset = 0,
500500 .export_flags = 0,
501501 });
502 try trie.put(.{
502 try trie.put(gpa, .{
503503 .name = "_main",
504504 .vmaddr_offset = 0x1000,
505505 .export_flags = 0,
506506 });
507507
508 try trie.finalize();
509 try trie.finalize(); // Finalizing mulitple times is a nop subsequently unless we add new nodes.
508 try trie.finalize(gpa);
509 try trie.finalize(gpa); // Finalizing mulitple times is a nop subsequently unless we add new nodes.
510510
511511 const exp_buffer = [_]u8{
512512 0x0, 0x1, // node root
......@@ -551,13 +551,13 @@ test "parse Trie from byte stream" {
551551 };
552552
553553 var in_stream = std.io.fixedBufferStream(&in_buffer);
554 var trie = Trie.init(gpa);
555 defer trie.deinit();
556 const nread = try trie.read(in_stream.reader());
554 var trie: Trie = .{};
555 defer trie.deinit(gpa);
556 const nread = try trie.read(gpa, in_stream.reader());
557557
558558 try testing.expect(nread == in_buffer.len);
559559
560 try trie.finalize();
560 try trie.finalize(gpa);
561561
562562 var out_buffer = try gpa.alloc(u8, trie.size);
563563 defer gpa.free(out_buffer);