public/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2025-10-29 23:23:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

wpt: remove useless Suite.stack

Browse Source
This commit is contained in:
Pierre Tachoire
2024-07-18 16:51:36 +02:00
parent b537e52a6d
commit 8c3939b842
2 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main_wpt.zig
View File

@@ -142,7 +142,7 @@ pub fn main() !void {
defer arena.deinit(); defer arena.deinit();
const res = wpt.run(&arena, wpt_dir, tc, &loader) catch |err| { const res = wpt.run(&arena, wpt_dir, tc, &loader) catch |err| {
const suite = try Suite.init(alloc, tc, false, @errorName(err), null); const suite = try Suite.init(alloc, tc, false, @errorName(err));
try results.append(suite); try results.append(suite);
if (out == .text) { if (out == .text) {
@@ -153,7 +153,7 @@ pub fn main() !void {
}; };
defer res.deinit(arena.allocator()); defer res.deinit(arena.allocator());
const suite = try Suite.init(alloc, tc, res.ok, res.msg orelse "", null); const suite = try Suite.init(alloc, tc, res.ok, res.msg orelse "");
try results.append(suite); try results.append(suite);
if (out == .json) { if (out == .json) {
@@ -196,7 +196,7 @@ pub fn main() !void {
try cases.append(Case{ try cases.append(Case{
.pass = suite.pass, .pass = suite.pass,
.name = suite.name, .name = suite.name,
.message = suite.stack orelse suite.message, .message = suite.message,
}); });
} }

23
src/wpt/testcase.zig
View File

@@ -67,28 +67,22 @@ pub const Suite = struct {
pass: bool, pass: bool,
name: []const u8, name: []const u8,
message: ?[]const u8, message: ?[]const u8,
stack: ?[]const u8,
cases: ?[]Case, cases: ?[]Case,
// caller owns the wpt.Suite. // caller owns the wpt.Suite.
// owner must call deinit(). // owner must call deinit().
pub fn init(alloc: std.mem.Allocator, name: []const u8, pass: bool, res: []const u8, stack: ?[]const u8) !Suite { pub fn init(alloc: std.mem.Allocator, name: []const u8, pass: bool, res: []const u8) !Suite {
var suite = Suite{ var suite = Suite{
.alloc = alloc, .alloc = alloc,
.pass = false, .pass = false,
.name = try alloc.dupe(u8, name), .name = try alloc.dupe(u8, name),
.message = null, .message = null,
.stack = null,
.cases = null, .cases = null,
}; };
// handle JS error. // handle JS error.
if (!pass) { if (!pass) {
suite.message = try alloc.dupe(u8, res); suite.message = try alloc.dupe(u8, res);
if (stack) |st| {
suite.stack = try alloc.dupe(u8, st);
}
return suite; return suite;
} }
@@ -155,10 +149,6 @@ pub const Suite = struct {
pub fn deinit(self: Suite) void { pub fn deinit(self: Suite) void {
self.alloc.free(self.name); self.alloc.free(self.name);
if (self.stack) |stack| {
self.alloc.free(stack);
}
if (self.message) |res| { if (self.message) |res| {
self.alloc.free(res); self.alloc.free(res);
} }
@@ -175,9 +165,6 @@ pub const Suite = struct {
if (self.message) |v| { if (self.message) |v| {
return v; return v;
} }
if (self.stack) |v| {
return v;
}
return ""; return "";
} }
}; };
@@ -199,7 +186,7 @@ test "success test case" {
, ,
}; };
const suite = Suite.init(alloc, "foo", res.pass, res.result, null) catch unreachable; // TODO const suite = Suite.init(alloc, "foo", res.pass, res.result) catch unreachable; // TODO
defer suite.deinit(); defer suite.deinit();
try testing.expect(suite.pass == true); try testing.expect(suite.pass == true);
@@ -226,7 +213,7 @@ test "failed test case" {
, ,
}; };
const suite = Suite.init(alloc, "foo", res.pass, res.result, null) catch unreachable; // TODO const suite = Suite.init(alloc, "foo", res.pass, res.result) catch unreachable; // TODO
defer suite.deinit(); defer suite.deinit();
try testing.expect(suite.pass == false); try testing.expect(suite.pass == false);
@@ -251,7 +238,7 @@ test "invalid result" {
, ,
}; };
const suite = Suite.init(alloc, "foo", res.pass, res.result, null) catch unreachable; // TODO const suite = Suite.init(alloc, "foo", res.pass, res.result) catch unreachable; // TODO
defer suite.deinit(); defer suite.deinit();
try testing.expect(suite.pass == false); try testing.expect(suite.pass == false);
@@ -266,7 +253,7 @@ test "invalid result" {
, ,
}; };
const suite2 = Suite.init(alloc, "foo", res2.pass, res2.result, null) catch unreachable; // TODO const suite2 = Suite.init(alloc, "foo", res2.pass, res2.result) catch unreachable; // TODO
defer suite2.deinit(); defer suite2.deinit();
try testing.expect(suite2.pass == false); try testing.expect(suite2.pass == false);