V2: WASI, -r flag, CI pipeline, examples & tests cleanup
Some checks failed
CI / build-test-release (pull_request) Failing after 44s
Some checks failed
CI / build-test-release (pull_request) Failing after 44s
WASI / wasm32 target support
- Auto-detect /usr/share/wasi-sysroot on Linux when target starts_with("wasm32")
- Skip -march/-mtune for wasm (clang rejects them)
- Apply -fno-exceptions -fno-c++-static-destructors -mllvm -wasm-enable-sjlj
-D_WASI_EMULATED_SIGNAL to wasm builds (compile + std PCM, kept in sync)
- .wasm output extension in expectedOutputFor and link command
- EnableWasiBrowserRuntime(cfg): opt-in helper that drops index.html +
runtime.js next to the .wasm; runtime.js reads window.CRAFTER_WASM_URL
set in the templated index.html so a single shim handles any output name
-r run flag in the CLI: build then exec the artifact (host targets only;
rejects libraries; auto .exe/.wasm extension handling)
CI pipeline (.forgejo/workflows/ci.yaml)
- Triggers: PR/push to master + manual dispatch
- Single arch-latest container job: install deps, bootstrap, self-rebuild,
run tests, cross-compile mingw, package both archives, upload artifacts
- Rolling 'latest' release published only on push/dispatch to master
mingw cross-compile from Linux now works end-to-end:
- ExternalDependency cache key includes target so per-target glslang builds
don't collide; CMAKE_BUILD_TYPE=Release pinned (otherwise glslang appends
'd' to lib names and breaks linking); cross-compile cmake flags
(CMAKE_SYSTEM_NAME=Windows, CMAKE_*_COMPILER_TARGET=...)
- project.cpp accepts --target=<triple>; Linux-only -Wl,--export-dynamic
and -ldl are gated; mingw glslang skips the standalone exe (its libgcc_eh
link pulls pthread which mingw doesn't link by default)
- mingw compile uses -femulated-tls so std::__once_callable etc reference
the same emutls symbols libstdc++ provides
- mingw link auto-adds -lstdc++exp -lpthread
GetCrafterBuildHome() exposed from the Platform module; LoadProject (Linux
+ Windows) now both use it instead of duplicating the resolution.
Examples reorg: hello-world, library, with-module, wasi, tests — each with
its own README. Tests reorg: per-test directory with inner/ fixture, no
shared tests/fixtures/ tree. New Wasi test verifies .wasm magic bytes.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
cdfdb976c8
commit
eaee502e8c
102 changed files with 2211 additions and 686 deletions
37
tests/RunnerClassification/RunnerClassification.cpp
Normal file
37
tests/RunnerClassification/RunnerClassification.cpp
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
/*
|
||||
Crafter® Build
|
||||
Copyright (C) 2026 Catcrafts®
|
||||
Catcrafts.net
|
||||
|
||||
LGPL-3.0-only.
|
||||
*/
|
||||
|
||||
import std;
|
||||
import Crafter.Build;
|
||||
#include "../_shared/TestUtil.h"
|
||||
namespace fs = std::filesystem;
|
||||
using namespace TestUtil;
|
||||
using namespace Crafter;
|
||||
|
||||
int main() {
|
||||
try {
|
||||
fs::path src = fs::current_path() / "tests" / "RunnerClassification" / "inner";
|
||||
Configuration cfg = LoadFixture("RunnerClassification", src);
|
||||
|
||||
RunTestsOptions opts;
|
||||
opts.timeoutOverride = std::chrono::seconds(2); // Hang test bounded
|
||||
TestSummary summary = RunTests(cfg, opts);
|
||||
|
||||
if (summary.passed != 1 || summary.failed != 1 ||
|
||||
summary.crashed != 1 || summary.timedOut != 1 || summary.skipped != 0) {
|
||||
std::println(std::cerr,
|
||||
"outcome counts mismatch: passed={} failed={} crashed={} timedOut={} skipped={}",
|
||||
summary.passed, summary.failed, summary.crashed, summary.timedOut, summary.skipped);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
} catch (const std::exception& e) {
|
||||
std::println(std::cerr, "test exception: {}", e.what());
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
33
tests/RunnerClassification/inner/project.cpp
Normal file
33
tests/RunnerClassification/inner/project.cpp
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
import std;
|
||||
import Crafter.Build;
|
||||
namespace fs = std::filesystem;
|
||||
using namespace Crafter;
|
||||
|
||||
extern "C" Configuration CrafterBuildProject(std::span<const std::string_view>) {
|
||||
Configuration cfg;
|
||||
cfg.path = "./";
|
||||
cfg.name = "rc-meta";
|
||||
cfg.outputName = "rc-meta";
|
||||
cfg.target = "x86_64-pc-linux-gnu";
|
||||
cfg.type = ConfigurationType::Executable;
|
||||
|
||||
auto addTest = [&](std::string name) {
|
||||
Test t;
|
||||
t.config.path = "./";
|
||||
t.config.name = name;
|
||||
t.config.outputName = name;
|
||||
t.config.target = "x86_64-pc-linux-gnu";
|
||||
t.config.type = ConfigurationType::Executable;
|
||||
std::array<fs::path, 0> empty = {};
|
||||
std::array<fs::path, 1> impls = { fs::path("tests") / name };
|
||||
t.config.GetInterfacesAndImplementations(empty, impls);
|
||||
cfg.tests.push_back(std::move(t));
|
||||
};
|
||||
|
||||
addTest("Pass");
|
||||
addTest("Fail");
|
||||
addTest("Crash");
|
||||
addTest("Hang");
|
||||
|
||||
return cfg;
|
||||
}
|
||||
4
tests/RunnerClassification/inner/tests/Crash.cpp
Normal file
4
tests/RunnerClassification/inner/tests/Crash.cpp
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
int main() {
|
||||
*(volatile int*)0 = 0;
|
||||
return 0;
|
||||
}
|
||||
1
tests/RunnerClassification/inner/tests/Fail.cpp
Normal file
1
tests/RunnerClassification/inner/tests/Fail.cpp
Normal file
|
|
@ -0,0 +1 @@
|
|||
int main() { return 1; }
|
||||
3
tests/RunnerClassification/inner/tests/Hang.cpp
Normal file
3
tests/RunnerClassification/inner/tests/Hang.cpp
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
int main() {
|
||||
for (;;) {}
|
||||
}
|
||||
1
tests/RunnerClassification/inner/tests/Pass.cpp
Normal file
1
tests/RunnerClassification/inner/tests/Pass.cpp
Normal file
|
|
@ -0,0 +1 @@
|
|||
int main() { return 0; }
|
||||
20
tests/RunnerClassification/project.cpp
Normal file
20
tests/RunnerClassification/project.cpp
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
import std;
|
||||
import Crafter.Build;
|
||||
namespace fs = std::filesystem;
|
||||
using namespace Crafter;
|
||||
|
||||
extern "C" Configuration CrafterBuildProject(std::span<const std::string_view>) {
|
||||
Configuration cfg;
|
||||
cfg.path = "tests/RunnerClassification/";
|
||||
cfg.name = "RunnerClassification";
|
||||
cfg.outputName = "RunnerClassification";
|
||||
cfg.target = "x86_64-pc-linux-gnu";
|
||||
cfg.type = ConfigurationType::Executable;
|
||||
cfg.dependencies = { ParentLib("crafter.build-lib") };
|
||||
cfg.linkFlags.push_back("-Wl,--export-dynamic");
|
||||
cfg.linkFlags.push_back("-ldl");
|
||||
std::array<fs::path, 0> ifaces = {};
|
||||
std::array<fs::path, 1> impls = { "RunnerClassification" };
|
||||
cfg.GetInterfacesAndImplementations(ifaces, impls);
|
||||
return cfg;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue