test runner, cross-target runners, lib/exe split
- subprocess-isolated test runner (replaces V1 dlopen-RunTest); Pass/Fail/Crash/Timeout/Skipped outcomes via :Test partition - TestRunner abstraction with command templates: Local, Ssh, SshWin (cmd.exe-shell), QemuUser, FromEnv; probe-based skip when runner unreachable - transitive PCM-path propagation in Build(); resolveImport walks deps recursively; depResults cache keyed by PcmDir() so per-target builds don't collide - cfg.sysroot threaded through BuildStdPcm + base compile/link command (enables aarch64 cross via Arch Linux ARM rootfs) - lib + exe split: project.cpp defines crafterBuildLib (LibraryStatic) + crafterBuildExe (Executable depending on it); build.sh produces lib/libcrafter-build.a alongside bin/crafter-build for downstream static-link consumers - Windows DLL+launcher: CRAFTER_API macro, /EXPORT flag for project.dll's CrafterBuildProject; Crafter::Run as the real entry point with main.cpp as a thin wrapper - 18 tests: HelloWorld/WithModule/Defines/CrossProjectModule/ Diamond × (Linux + sshwin:winvm), plus Incremental, BuildError, Libraries, RunnerClassification, QemuUser, SshRunner, WindowsViaSsh, CrossArchAarch64 - single ./bin/crafter-build test runs everything; Windows variants skip gracefully if winvm SSH alias unreachable Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
parent
f13671b2be
commit
cdfdb976c8
60 changed files with 2029 additions and 104 deletions
11
interfaces/Crafter.Build-Api.h
Normal file
11
interfaces/Crafter.Build-Api.h
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
#pragma once
|
||||
|
||||
#if defined(_WIN32)
|
||||
#if defined(CRAFTER_BUILD_DLL_IMPORT)
|
||||
#define CRAFTER_API __declspec(dllimport)
|
||||
#else
|
||||
#define CRAFTER_API __declspec(dllexport)
|
||||
#endif
|
||||
#else
|
||||
#define CRAFTER_API
|
||||
#endif
|
||||
|
|
@ -17,6 +17,8 @@ License along with this library; if not, write to the Free Software
|
|||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
module;
|
||||
#include "Crafter.Build-Api.h"
|
||||
export module Crafter.Build:Clang;
|
||||
import std;
|
||||
import :Shader;
|
||||
|
|
@ -43,6 +45,39 @@ export namespace Crafter {
|
|||
LibraryDynamic,
|
||||
};
|
||||
|
||||
struct Test;
|
||||
|
||||
struct TestRunner {
|
||||
std::string copy;
|
||||
std::string exec;
|
||||
std::string cleanup;
|
||||
std::string remoteDir;
|
||||
std::string name;
|
||||
// Runs once per RunTests invocation (cached by `name`). Exit 0 = runner
|
||||
// is available; non-zero = skip every Test using this runner with a
|
||||
// "runner unavailable" message. Empty = always available (e.g., Local).
|
||||
std::string probe;
|
||||
|
||||
bool IsLocal() const { return exec.empty(); }
|
||||
|
||||
static CRAFTER_API TestRunner Local();
|
||||
static CRAFTER_API TestRunner Ssh(std::string host, std::string remoteDir = "/tmp/crafter-tests");
|
||||
static CRAFTER_API TestRunner SshWin(std::string host, std::string remoteDir = "C:/temp/crafter-tests");
|
||||
static CRAFTER_API TestRunner QemuUser(std::string qemuBin);
|
||||
static CRAFTER_API TestRunner FromEnv(std::string_view target, TestRunner fallback = Local());
|
||||
};
|
||||
|
||||
enum class TestOutcome { Pass, Fail, Crash, Timeout, Skipped };
|
||||
|
||||
struct TestResult {
|
||||
std::string name;
|
||||
TestOutcome outcome = TestOutcome::Pass;
|
||||
int exitCode = 0;
|
||||
int signal = 0;
|
||||
std::chrono::milliseconds duration{0};
|
||||
std::string output;
|
||||
};
|
||||
|
||||
struct Configuration {
|
||||
fs::path path;
|
||||
std::string outputName;
|
||||
|
|
@ -50,6 +85,7 @@ export namespace Crafter {
|
|||
std::string march = "native";
|
||||
std::string mtune = "native";
|
||||
std::string target;
|
||||
std::string sysroot;
|
||||
bool debug = false;
|
||||
ConfigurationType type = ConfigurationType::Executable;
|
||||
std::vector<std::unique_ptr<Module>> interfaces;
|
||||
|
|
@ -63,7 +99,8 @@ export namespace Crafter {
|
|||
std::vector<ExternalDependency> externalDependencies;
|
||||
std::vector<std::string> compileFlags;
|
||||
std::vector<std::string> linkFlags;
|
||||
void GetInterfacesAndImplementations(std::span<fs::path> interfaces, std::span<fs::path> implementations);
|
||||
std::vector<Test> tests;
|
||||
CRAFTER_API void GetInterfacesAndImplementations(std::span<fs::path> interfaces, std::span<fs::path> implementations);
|
||||
fs::path PcmDir() const {
|
||||
return path
|
||||
/ (type == ConfigurationType::Executable ? "build" : "bin")
|
||||
|
|
@ -71,7 +108,14 @@ export namespace Crafter {
|
|||
}
|
||||
};
|
||||
|
||||
BuildResult Build(Configuration& config, std::unordered_map<fs::path, std::shared_future<BuildResult>>& depResults, std::mutex& depMutex);
|
||||
struct Test {
|
||||
Configuration config;
|
||||
TestRunner runner;
|
||||
std::chrono::seconds timeout{60};
|
||||
std::vector<std::string> args;
|
||||
};
|
||||
|
||||
int Run(int argc, char** argv);
|
||||
CRAFTER_API BuildResult Build(Configuration& config, std::unordered_map<fs::path, std::shared_future<BuildResult>>& depResults, std::mutex& depMutex);
|
||||
|
||||
CRAFTER_API int Run(int argc, char** argv);
|
||||
}
|
||||
|
|
@ -17,6 +17,8 @@ License along with this library; if not, write to the Free Software
|
|||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
module;
|
||||
#include "Crafter.Build-Api.h"
|
||||
export module Crafter.Build:External;
|
||||
import std;
|
||||
namespace fs = std::filesystem;
|
||||
|
|
@ -49,7 +51,7 @@ export namespace Crafter {
|
|||
fs::file_time_type latestArtifact = fs::file_time_type::min();
|
||||
};
|
||||
|
||||
ExternalBuildResult BuildExternal(
|
||||
CRAFTER_API ExternalBuildResult BuildExternal(
|
||||
const ExternalDependency& dep,
|
||||
std::atomic<bool>& cancelled);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@ License along with this library; if not, write to the Free Software
|
|||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
module;
|
||||
#include "Crafter.Build-Api.h"
|
||||
export module Crafter.Build:Implementation;
|
||||
import std;
|
||||
namespace fs = std::filesystem;
|
||||
|
|
@ -30,8 +32,8 @@ namespace Crafter {
|
|||
std::vector<ModulePartition*> partitionDependencies;
|
||||
std::vector<std::pair<Module*, fs::path>> externalModuleDependencies;
|
||||
fs::path path;
|
||||
Implementation(fs::path&& path);
|
||||
bool Check(const fs::path& buildDir, const fs::path& pcmDir, fs::file_time_type sourceFloor = fs::file_time_type::min()) const;
|
||||
void Compile(const std::string_view clang, const fs::path& buildDir, std::atomic<bool>& buildCancelled, std::string& buildError) const;
|
||||
CRAFTER_API Implementation(fs::path&& path);
|
||||
CRAFTER_API bool Check(const fs::path& buildDir, const fs::path& pcmDir, fs::file_time_type sourceFloor = fs::file_time_type::min()) const;
|
||||
CRAFTER_API void Compile(const std::string_view clang, const fs::path& buildDir, std::atomic<bool>& buildCancelled, std::string& buildError) const;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@ License along with this library; if not, write to the Free Software
|
|||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
module;
|
||||
#include "Crafter.Build-Api.h"
|
||||
export module Crafter.Build:Interface;
|
||||
import std;
|
||||
namespace fs = std::filesystem;
|
||||
|
|
@ -33,9 +35,9 @@ namespace Crafter {
|
|||
bool checked = false;
|
||||
std::string name;
|
||||
fs::path path;
|
||||
ModulePartition(std::string&& name, fs::path&& path);
|
||||
bool Check(const fs::path& pcmDir, fs::file_time_type sourceFloor = fs::file_time_type::min());
|
||||
void Compile(const std::string_view clang, const fs::path& pcmDir, const fs::path& buildDir, std::atomic<bool>& buildCancelled, std::string& buildError);
|
||||
CRAFTER_API ModulePartition(std::string&& name, fs::path&& path);
|
||||
CRAFTER_API bool Check(const fs::path& pcmDir, fs::file_time_type sourceFloor = fs::file_time_type::min());
|
||||
CRAFTER_API void Compile(const std::string_view clang, const fs::path& pcmDir, const fs::path& buildDir, std::atomic<bool>& buildCancelled, std::string& buildError);
|
||||
};
|
||||
|
||||
export class Module {
|
||||
|
|
@ -46,8 +48,8 @@ namespace Crafter {
|
|||
std::vector<std::unique_ptr<ModulePartition>> partitions;
|
||||
std::string name;
|
||||
fs::path path;
|
||||
Module(std::string&& name, fs::path&& path);
|
||||
bool Check(const fs::path& pcmDir, fs::file_time_type sourceFloor = fs::file_time_type::min());
|
||||
void Compile(const std::string_view clang, const fs::path& pcmDir, const fs::path& buildDir, std::atomic<bool>& buildCancelled, std::string& buildError);
|
||||
CRAFTER_API Module(std::string&& name, fs::path&& path);
|
||||
CRAFTER_API bool Check(const fs::path& pcmDir, fs::file_time_type sourceFloor = fs::file_time_type::min());
|
||||
CRAFTER_API void Compile(const std::string_view clang, const fs::path& pcmDir, const fs::path& buildDir, std::atomic<bool>& buildCancelled, std::string& buildError);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@ License along with this library; if not, write to the Free Software
|
|||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
module;
|
||||
#include "Crafter.Build-Api.h"
|
||||
export module Crafter.Build:Platform;
|
||||
import std;
|
||||
namespace fs = std::filesystem;
|
||||
|
|
@ -24,13 +26,17 @@ namespace fs = std::filesystem;
|
|||
namespace Crafter {
|
||||
struct Configuration;
|
||||
struct CommandResult {
|
||||
int exitCode;
|
||||
int exitCode = 0;
|
||||
std::string output;
|
||||
bool crashed = false;
|
||||
bool timedOut = false;
|
||||
int signal = 0;
|
||||
};
|
||||
std::string BuildStdPcm(const Configuration& config, fs::path stdPcm);
|
||||
fs::path GetCacheDir();
|
||||
std::string RunCommand(const std::string_view command);
|
||||
CommandResult RunCommandChecked(std::string_view command);
|
||||
export CRAFTER_API CommandResult RunCommandWithTimeout(std::string_view command, std::chrono::seconds timeout);
|
||||
std::string GetBaseCommand(const Configuration& config);
|
||||
export Configuration LoadProject(const fs::path& projectFile, std::span<const std::string_view> args);
|
||||
export CRAFTER_API Configuration LoadProject(const fs::path& projectFile, std::span<const std::string_view> args);
|
||||
}
|
||||
|
|
@ -17,6 +17,8 @@ License along with this library; if not, write to the Free Software
|
|||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
module;
|
||||
#include "Crafter.Build-Api.h"
|
||||
export module Crafter.Build:Shader;
|
||||
import std;
|
||||
namespace fs = std::filesystem;
|
||||
|
|
@ -44,8 +46,8 @@ namespace Crafter {
|
|||
fs::path path;
|
||||
std::string entrypoint;
|
||||
ShaderType type;
|
||||
Shader(fs::path&& path, std::string&& entrypoint, ShaderType type);
|
||||
bool Check(const fs::path& outputDir) const;
|
||||
std::string Compile(const fs::path& outputDir) const;
|
||||
CRAFTER_API Shader(fs::path&& path, std::string&& entrypoint, ShaderType type);
|
||||
CRAFTER_API bool Check(const fs::path& outputDir) const;
|
||||
CRAFTER_API std::string Compile(const fs::path& outputDir) const;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
46
interfaces/Crafter.Build-Test.cppm
Normal file
46
interfaces/Crafter.Build-Test.cppm
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
/*
|
||||
Crafter® Build
|
||||
Copyright (C) 2026 Catcrafts®
|
||||
Catcrafts.net
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License version 3.0 as published by the Free Software Foundation;
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
module;
|
||||
#include "Crafter.Build-Api.h"
|
||||
export module Crafter.Build:Test;
|
||||
import std;
|
||||
import :Clang;
|
||||
|
||||
export namespace Crafter {
|
||||
struct RunTestsOptions {
|
||||
std::vector<std::string> globs;
|
||||
int jobs = 0;
|
||||
std::optional<std::chrono::seconds> timeoutOverride;
|
||||
bool listOnly = false;
|
||||
};
|
||||
|
||||
struct TestSummary {
|
||||
int passed = 0;
|
||||
int failed = 0;
|
||||
int crashed = 0;
|
||||
int timedOut = 0;
|
||||
int skipped = 0;
|
||||
std::vector<TestResult> results;
|
||||
bool AllPassed() const { return failed == 0 && crashed == 0 && timedOut == 0; }
|
||||
};
|
||||
|
||||
CRAFTER_API TestSummary RunTests(Configuration& projectCfg, const RunTestsOptions& opts);
|
||||
CRAFTER_API TestResult RunSingleTest(const Test& test, const std::filesystem::path& binary, std::chrono::seconds timeout);
|
||||
}
|
||||
|
|
@ -22,4 +22,5 @@ export import :Clang;
|
|||
export import :Platform;
|
||||
export import :Implementation;
|
||||
export import :Shader;
|
||||
export import :External;
|
||||
export import :External;
|
||||
export import :Test;
|
||||
Loading…
Add table
Add a link
Reference in a new issue