diff --git a/tests/CrossArchAarch64/CrossArchAarch64.cpp b/tests/CrossArchAarch64/CrossArchAarch64.cpp index 888369e..4e6f285 100644 --- a/tests/CrossArchAarch64/CrossArchAarch64.cpp +++ b/tests/CrossArchAarch64/CrossArchAarch64.cpp @@ -44,7 +44,7 @@ int main() { return 1; } - fs::path artifact = work / "bin" / "aarch-hello-aarch64-linux-gnu-armv8-a" / "aarch-hello"; + fs::path artifact = cfg.BinDir() / "aarch-hello"; if (!fs::exists(artifact)) { std::println(std::cerr, "expected artifact missing at {}", artifact.string()); return 1; diff --git a/tests/Cuda/Cuda.cpp b/tests/Cuda/Cuda.cpp index b46dcb8..27802c2 100644 --- a/tests/Cuda/Cuda.cpp +++ b/tests/Cuda/Cuda.cpp @@ -67,7 +67,7 @@ int main() { return 1; } - fs::path artifact = work / "bin" / "cuda-test-x86_64-pc-linux-gnu-native" / "cuda-test"; + fs::path artifact = cfg.BinDir() / "cuda-test"; if (!fs::exists(artifact)) { std::println(std::cerr, "expected artifact missing at {}", artifact.string()); return 1; diff --git a/tests/Incremental/Incremental.cpp b/tests/Incremental/Incremental.cpp index d25f1eb..ae10c13 100644 --- a/tests/Incremental/Incremental.cpp +++ b/tests/Incremental/Incremental.cpp @@ -26,9 +26,8 @@ int main() { return 1; } - fs::path buildDir = work / "build" / "hello-mod-x86_64-pc-linux-gnu-native"; - fs::path greeterObj = buildDir / "Greeter.o"; - fs::path mainObj = buildDir / "main_impl.o"; + fs::path greeterObj = cfg.BuildDir() / "Greeter.o"; + fs::path mainObj = cfg.BuildDir() / "main_impl.o"; if (!fs::exists(greeterObj) || !fs::exists(mainObj)) { std::println(std::cerr, "expected .o files missing after cold build"); return 1; diff --git a/tests/Libraries/Libraries.cpp b/tests/Libraries/Libraries.cpp index 0dc0000..95df19f 100644 --- a/tests/Libraries/Libraries.cpp +++ b/tests/Libraries/Libraries.cpp @@ -25,9 +25,9 @@ int main() { return 1; } - fs::path staticArchive = work / "mathlib" / "bin" / "MathLib-x86_64-pc-linux-gnu-native" / "libMathLib.a"; - fs::path dynamicSO = work / "greetlib" / "bin" / "GreetLib-x86_64-pc-linux-gnu-native" / "libGreetLib.so"; - fs::path artifact = work / "bin" / "libs-app-x86_64-pc-linux-gnu-native" / "libs-app"; + fs::path staticArchive = cfg.dependencies[0]->BinDir() / "libMathLib.a"; + fs::path dynamicSO = cfg.dependencies[1]->BinDir() / "libGreetLib.so"; + fs::path artifact = cfg.BinDir() / "libs-app"; if (!fs::exists(staticArchive)) { std::println(std::cerr, "static archive missing at {}", staticArchive.string()); diff --git a/tests/Shader/Shader.cpp b/tests/Shader/Shader.cpp index 75adfde..1ee0c88 100644 --- a/tests/Shader/Shader.cpp +++ b/tests/Shader/Shader.cpp @@ -33,7 +33,7 @@ int main() { return 1; } - fs::path spv = work / "bin" / "shader-test-x86_64-pc-linux-gnu-native" / "triangle.spv"; + fs::path spv = cfg.BinDir() / "triangle.spv"; if (!fs::exists(spv)) { std::println(std::cerr, "expected SPIR-V output missing at {}", spv.string()); return 1; diff --git a/tests/Wasi/Wasi.cpp b/tests/Wasi/Wasi.cpp index dcb22a7..3e2ce8a 100644 --- a/tests/Wasi/Wasi.cpp +++ b/tests/Wasi/Wasi.cpp @@ -21,7 +21,7 @@ int main() { return 1; } - fs::path artifact = work / "bin" / "wasi-hello-wasm32-wasip1-native" / "wasi-hello.wasm"; + fs::path artifact = cfg.BinDir() / "wasi-hello.wasm"; if (!fs::exists(artifact)) { std::println(std::cerr, "expected artifact missing at {}", artifact.string()); return 1;