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

Merge pull request #15 from Browsercore/remove_test_from_main

Browse Source 
remove tests from main and update jsruntime
This commit is contained in:
Francis Bouvier
2023-09-28 15:42:54 +02:00
committed by GitHub
parent a53cac19c9 bca3195550
commit 07c4779676
3 changed files with 21 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/main.zig
View File

@@ -4,8 +4,6 @@ const jsruntime = @import("jsruntime");
const parser = @import("netsurf.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";
@@ -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 {
// generate APIs
@@ -77,31 +57,26 @@ pub fn main() !void {
doc = parser.documentHTMLParse(&f);
// TODO: defer doc?
// // remove socket file of internal server
// // reuse_address (SO_REUSEADDR flag) does not seems to work on unix socket
// // see: https://gavv.net/articles/unix-socket-reuse/
// // TODO: use a lock file instead
// std.os.unlink(socket_path) catch |err| {
// if (err != error.FileNotFound) {
// return err;
// }
// };
// remove socket file of internal server
// reuse_address (SO_REUSEADDR flag) does not seems to work on unix socket
// see: https://gavv.net/articles/unix-socket-reuse/
// TODO: use a lock file instead
std.os.unlink(socket_path) catch |err| {
if (err != error.FileNotFound) {
return err;
}
};
// alloc
// var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
// 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();
var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
defer arena.deinit();
// // server
// var addr = try std.net.Address.initUnix(socket_path);
// server = std.net.StreamServer.init(.{});
// defer server.deinit();
// try server.listen(addr);
// std.debug.print("Listening on: {s}...\n", .{socket_path});
// server
var addr = try std.net.Address.initUnix(socket_path);
server = std.net.StreamServer.init(.{});
defer server.deinit();
try server.listen(addr);
std.debug.print("Listening on: {s}...\n", .{socket_path});
// try jsruntime.loadEnv(&arena, execJS, apis);
try jsruntime.loadEnv(&arena_alloc, testsExecFn, apis);
try jsruntime.loadEnv(&arena, execJS, apis);
}

4
src/run_tests.zig
View File

@@ -6,7 +6,7 @@ const generate = @import("generate.zig");
const parser = @import("netsurf.zig");
const DOM = @import("dom.zig");
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;
@@ -29,7 +29,7 @@ fn testsExecFn(
}
test {
std.debug.print("\n", .{});
std.debug.print("\n \n", .{});
// generate tests
try generate.tests();

2
vendor/jsruntime-lib vendored

Submodule vendor/jsruntime-lib updated: 4ba1cb4b5c...35884be6a7