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: fix zig-0.14 compat

Browse Source
This commit is contained in:
Pierre Tachoire
2025-03-19 16:48:22 +01:00
parent b51499e87b
commit 55a942aa22
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/wpt/run.zig
View File

@@ -77,11 +77,11 @@ pub fn run(arena: *std.heap.ArenaAllocator, comptime dir: []const u8, f: []const
defer js_env.stop(); defer js_env.stop();
// load polyfills // load polyfills
try polyfill.load(alloc, js_env); try polyfill.load(alloc, &js_env);
// display console logs // display console logs
defer { defer {
const res = evalJS(js_env, alloc, "console.join('\\n');", "console") catch unreachable; const res = evalJS(&js_env, alloc, "console.join('\\n');", "console") catch unreachable;
defer res.deinit(alloc); defer res.deinit(alloc);
if (res.msg != null and res.msg.?.len > 0) { if (res.msg != null and res.msg.?.len > 0) {
@@ -104,7 +104,7 @@ pub fn run(arena: *std.heap.ArenaAllocator, comptime dir: []const u8, f: []const
\\ console.push("debug", ...arguments); \\ console.push("debug", ...arguments);
\\}; \\};
; ;
var res = try evalJS(js_env, alloc, init, "init"); var res = try evalJS(&js_env, alloc, init, "init");
if (!res.ok) return res; if (!res.ok) return res;
res.deinit(alloc); res.deinit(alloc);
@@ -123,14 +123,14 @@ pub fn run(arena: *std.heap.ArenaAllocator, comptime dir: []const u8, f: []const
path = try fspath.join(alloc, &.{ "/", dirname, path }); path = try fspath.join(alloc, &.{ "/", dirname, path });
} }
res = try evalJS(js_env, alloc, try loader.get(path), src); res = try evalJS(&js_env, alloc, try loader.get(path), src);
if (!res.ok) return res; if (!res.ok) return res;
res.deinit(alloc); res.deinit(alloc);
} }
// If the script as a source text, execute it. // If the script as a source text, execute it.
const src = try parser.nodeTextContent(s) orelse continue; const src = try parser.nodeTextContent(s) orelse continue;
res = try evalJS(js_env, alloc, src, ""); res = try evalJS(&js_env, alloc, src, "");
if (!res.ok) return res; if (!res.ok) return res;
res.deinit(alloc); res.deinit(alloc);
} }
@@ -147,22 +147,22 @@ pub fn run(arena: *std.heap.ArenaAllocator, comptime dir: []const u8, f: []const
// wait for all async executions // wait for all async executions
var try_catch: jsruntime.TryCatch = undefined; var try_catch: jsruntime.TryCatch = undefined;
try_catch.init(js_env); try_catch.init(&js_env);
defer try_catch.deinit(); defer try_catch.deinit();
js_env.wait() catch { js_env.wait() catch {
return .{ return .{
.ok = false, .ok = false,
.msg = try try_catch.err(alloc, js_env), .msg = try try_catch.err(alloc, &js_env),
}; };
}; };
// Check the final test status. // Check the final test status.
res = try evalJS(js_env, alloc, "report.status;", "teststatus"); res = try evalJS(&js_env, alloc, "report.status;", "teststatus");
if (!res.ok) return res; if (!res.ok) return res;
res.deinit(alloc); res.deinit(alloc);
// return the detailed result. // return the detailed result.
return try evalJS(js_env, alloc, "report.log", "teststatus"); return try evalJS(&js_env, alloc, "report.log", "teststatus");
} }
pub const Res = struct { pub const Res = struct {
@@ -176,7 +176,7 @@ pub const Res = struct {
} }
}; };
fn evalJS(env: jsruntime.Env, alloc: std.mem.Allocator, script: []const u8, name: ?[]const u8) !Res { fn evalJS(env: *const jsruntime.Env, alloc: std.mem.Allocator, script: []const u8, name: ?[]const u8) !Res {
var try_catch: jsruntime.TryCatch = undefined; var try_catch: jsruntime.TryCatch = undefined;
try_catch.init(env); try_catch.init(env);
defer try_catch.deinit(); defer try_catch.deinit();