remove tests from main, fix tests and update jsruntime

Signed-off-by: Francis Bouvier <francis.bouvier@gmail.com>
This commit is contained in:
Francis Bouvier
2023-09-28 15:25:57 +02:00
parent a53cac19c9
commit bca3195550
3 changed files with 21 additions and 46 deletions

View File

@@ -4,8 +4,6 @@ const jsruntime = @import("jsruntime");
const parser = @import("netsurf.zig"); const parser = @import("netsurf.zig");
const DOM = @import("dom.zig"); const DOM = @import("dom.zig");
const docTestExecFn = @import("html/document.zig").testExecFn;
const nodeTestExecFn = @import("dom/node.zig").testExecFn;
const socket_path = "/tmp/browsercore-server.sock"; const socket_path = "/tmp/browsercore-server.sock";
@@ -45,24 +43,6 @@ fn execJS(
} }
} }
fn testsExecFn(
alloc: std.mem.Allocator,
js_env: *jsruntime.Env,
comptime apis: []jsruntime.API,
) !void {
// start JS env
js_env.start(apis);
defer js_env.stop();
// add document object
try js_env.addObject(apis, doc, "document");
// run tests
try docTestExecFn(alloc, js_env, apis);
try nodeTestExecFn(alloc, js_env, apis);
}
pub fn main() !void { pub fn main() !void {
// generate APIs // generate APIs
@@ -77,31 +57,26 @@ pub fn main() !void {
doc = parser.documentHTMLParse(&f); doc = parser.documentHTMLParse(&f);
// TODO: defer doc? // TODO: defer doc?
// // remove socket file of internal server // remove socket file of internal server
// // reuse_address (SO_REUSEADDR flag) does not seems to work on unix socket // reuse_address (SO_REUSEADDR flag) does not seems to work on unix socket
// // see: https://gavv.net/articles/unix-socket-reuse/ // see: https://gavv.net/articles/unix-socket-reuse/
// // TODO: use a lock file instead // TODO: use a lock file instead
// std.os.unlink(socket_path) catch |err| { std.os.unlink(socket_path) catch |err| {
// if (err != error.FileNotFound) { if (err != error.FileNotFound) {
// return err; return err;
// } }
// }; };
// alloc // alloc
// var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
// defer arena.deinit(); defer arena.deinit();
var gpa = std.heap.GeneralPurposeAllocator(.{}){};
var bench_alloc = jsruntime.bench_allocator(gpa.allocator());
var arena_alloc = std.heap.ArenaAllocator.init(bench_alloc.allocator());
defer arena_alloc.deinit();
// // server // server
// var addr = try std.net.Address.initUnix(socket_path); var addr = try std.net.Address.initUnix(socket_path);
// server = std.net.StreamServer.init(.{}); server = std.net.StreamServer.init(.{});
// defer server.deinit(); defer server.deinit();
// try server.listen(addr); try server.listen(addr);
// std.debug.print("Listening on: {s}...\n", .{socket_path}); std.debug.print("Listening on: {s}...\n", .{socket_path});
// try jsruntime.loadEnv(&arena, execJS, apis); try jsruntime.loadEnv(&arena, execJS, apis);
try jsruntime.loadEnv(&arena_alloc, testsExecFn, apis);
} }

View File

@@ -6,7 +6,7 @@ const generate = @import("generate.zig");
const parser = @import("netsurf.zig"); const parser = @import("netsurf.zig");
const DOM = @import("dom.zig"); const DOM = @import("dom.zig");
const docTestExecFn = @import("html/document.zig").testExecFn; const docTestExecFn = @import("html/document.zig").testExecFn;
const nodeTestExecFn = @import("html/document.zig").testExecFn; const nodeTestExecFn = @import("dom/node.zig").testExecFn;
var doc: *parser.DocumentHTML = undefined; var doc: *parser.DocumentHTML = undefined;
@@ -29,7 +29,7 @@ fn testsExecFn(
} }
test { test {
std.debug.print("\n", .{}); std.debug.print("\n \n", .{});
// generate tests // generate tests
try generate.tests(); try generate.tests();