Make runner support executing binaries. (#42)

* Execute the main entry

* Wasm64

* Fix

* Add TODO

* Switch priority

Author: Spxg

TODO.md

@@ -79,6 +79,8 @@
 
 # Medium Priority
 
+- Binary Runner:
+  - Consider how to run tests with `harness = false`.
 - Find a way to link to imports directly if no wrapper function is needed. This happens when no
   conversions on the WAT level are necessary.
 - Provide an absolutely minimal allocator.

host/cargo-shim/linker

@@ -3,7 +3,7 @@
 if [ "$JBG_DEV_TOOLS" = "1" ]; then
     js-bindgen-ld $@
 else
-    cd $(dirname $0)/..
+    cd $(dirname $0)
     # This is passed when running Doctests.
     unset RUSTC_BOOTSTRAP
     cargo +stable run -q -p js-bindgen-ld -- $@

host/cargo-shim/runner

@@ -3,6 +3,6 @@
 if [ "$JBG_DEV_TOOLS" = "1" ]; then
     js-bindgen-runner $@
 else
-    cd $(dirname $0)/..
+    cd $(dirname $0)
     cargo +stable run -q -p js-bindgen-runner -- $@
 fi

host/ld/src/main.rs

@@ -22,6 +22,7 @@ fn main() {
 		output_path,
 		main_memory,
 		js_store,
+		is_test,
 	} = pre::processing(&args);
 
 	let status = Command::new("rust-lld")
@@ -43,7 +44,7 @@ fn main() {
 		);
 
 		let wasm_output =
-			post::processing(&wasm_input, &mut js_output, main_memory, js_store).unwrap();
+			post::processing(&wasm_input, &mut js_output, main_memory, js_store, is_test).unwrap();
 		drop(wasm_input);
 
 		// We could write into the file directly, but `wasm-encoder` doesn't support

host/ld/src/post.rs

@@ -3,8 +3,10 @@ use std::str;
 
 use anyhow::{Context, Result, bail};
 use itertools::{Itertools, Position};
+use js_bindgen_shared::IS_TEST_SECTION;
 use wasm_encoder::{
-	EntityType, ImportSection, Module, ProducersField, ProducersSection, RawSection, Section,
+	CustomSection, EntityType, ImportSection, Module, ProducersField, ProducersSection, RawSection,
+	Section,
 };
 use wasmparser::{Encoding, KnownCustom, Parser, Payload, TypeRef};
 
@@ -19,6 +21,7 @@ pub fn processing(
 	mut js_output: impl Write,
 	main_memory: MainMemory<'_>,
 	mut js_store: JsStore,
+	is_test: bool,
 ) -> Result<Vec<u8>> {
 	// Start building final Wasm and JS.
 	let mut wasm_output = Vec::new();
@@ -107,6 +110,14 @@ pub fn processing(
 		}
 	}
 
+	if is_test {
+		CustomSection {
+			name: IS_TEST_SECTION.into(),
+			data: (&[]).into(),
+		}
+		.append_to(&mut wasm_output);
+	}
+
 	let memory = memory.context("main memory should be present")?;
 	js_store.assert_expected()?;
 

host/ld/src/pre.rs

@@ -1,4 +1,4 @@
-use std::ffi::OsString;
+use std::ffi::{OsStr, OsString};
 use std::fs;
 use std::path::Path;
 use std::time::SystemTime;
@@ -15,6 +15,7 @@ pub struct PreOutput<'args> {
 	pub output_path: &'args Path,
 	pub main_memory: MainMemory<'args>,
 	pub js_store: JsStore,
+	pub is_test: bool,
 }
 
 #[derive(Clone, Copy)]
@@ -66,9 +67,12 @@ pub fn processing(args: &[OsString]) -> PreOutput<'_> {
 	let main_memory = main_memory(arch, &wasm_ld_args, &mut add_args);
 
 	let mut js_store = JsStore::default();
+	let mut is_test = false;
 
 	// Extract embedded WAT from object files.
 	for input in wasm_ld_args.inputs() {
+		is_test |= is_libtest(input);
+
 		js_bindgen_ld_shared::ld_input_parser(input, |path, data, object_mtime| {
 			process_object(
 				&mut js_store,
@@ -88,9 +92,17 @@ pub fn processing(args: &[OsString]) -> PreOutput<'_> {
 		output_path,
 		main_memory,
 		js_store,
+		is_test,
 	}
 }
 
+fn is_libtest(input: &OsStr) -> bool {
+	Path::new(input)
+		.file_name()
+		.and_then(OsStr::to_str)
+		.is_some_and(|name| name.starts_with("libtest-"))
+}
+
 /// Extracts any WAT instructions from `js-bindgen`, builds object files from
 /// them and passes them to the linker.
 fn process_object(

host/runner/src/js/deno/deno.mjs

@@ -1,10 +1,10 @@
-import { runTests, Stream, Status } from "../shared/shared.mjs"
+import { run, Stream } from "../shared/shared.mjs"
 import { colorText } from "../shared/shared-terminal.mjs"
 import { JsBindgen } from "../imports.mts"
 
 const module = await WebAssembly.compileStreaming(fetch(new URL("../wasm.wasm", import.meta.url)))
 
-const success = await runTests(module, JsBindgen, (stream, text) => {
+const status = await run(module, JsBindgen, (stream, text) => {
 	function printSync(input: string, to: typeof Deno.stdout | typeof Deno.stderr) {
 		let bytesWritten = 0
 		const bytes = new TextEncoder().encode(input)
@@ -25,4 +25,4 @@ const success = await runTests(module, JsBindgen, (stream, text) => {
 	}
 })
 
-Deno.exit(success === Status.Ok ? 0 : 101)
+Deno.exit(status)