From 33f70be85ef83b0ebeaa6755b67558ae2f5ae8e6 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sun, 21 Aug 2022 09:47:53 +0200 Subject: WIP: unit-test fixes --- test/tools_test.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'test/tools_test.cc') diff --git a/test/tools_test.cc b/test/tools_test.cc index 3e9de1b..4000665 100644 --- a/test/tools_test.cc +++ b/test/tools_test.cc @@ -116,41 +116,41 @@ public: { // host conf_host_cxx = "/usr/bin/g++"; - uASSERT_EQUAL(ToolChain::gcc, getToolChain(OutputSystem::Host)); + uUNIT_ASSERT_EQUAL(ToolChain::gcc, getToolChain(OutputSystem::Host)); conf_host_cxx = "/usr/bin/g++-10"; - uASSERT_EQUAL(ToolChain::gcc, getToolChain(OutputSystem::Host)); + uUNIT_ASSERT_EQUAL(ToolChain::gcc, getToolChain(OutputSystem::Host)); conf_host_cxx = "/usr/bin/x86_64-pc-linux-gnu-g++-9.3.0"; - uASSERT_EQUAL(ToolChain::gcc, getToolChain(OutputSystem::Host)); + uUNIT_ASSERT_EQUAL(ToolChain::gcc, getToolChain(OutputSystem::Host)); conf_host_cxx = "/usr/bin/clang++"; - uASSERT_EQUAL(ToolChain::clang, getToolChain(OutputSystem::Host)); + uUNIT_ASSERT_EQUAL(ToolChain::clang, getToolChain(OutputSystem::Host)); conf_host_cxx = "/usr/bin/clang++-10"; - uASSERT_EQUAL(ToolChain::clang, getToolChain(OutputSystem::Host)); + uUNIT_ASSERT_EQUAL(ToolChain::clang, getToolChain(OutputSystem::Host)); conf_host_cxx = "/usr/lib/llvm/12/bin/i686-pc-linux-gnu-clang++-12"; - uASSERT_EQUAL(ToolChain::clang, getToolChain(OutputSystem::Host)); + uUNIT_ASSERT_EQUAL(ToolChain::clang, getToolChain(OutputSystem::Host)); // build conf_build_cxx = "/usr/bin/g++"; - uASSERT_EQUAL(ToolChain::gcc, getToolChain(OutputSystem::Build)); + uUNIT_ASSERT_EQUAL(ToolChain::gcc, getToolChain(OutputSystem::Build)); conf_build_cxx = "/usr/bin/g++-10"; - uASSERT_EQUAL(ToolChain::gcc, getToolChain(OutputSystem::Build)); + uUNIT_ASSERT_EQUAL(ToolChain::gcc, getToolChain(OutputSystem::Build)); conf_build_cxx = "/usr/bin/x86_64-pc-linux-gnu-g++-9.3.0"; - uASSERT_EQUAL(ToolChain::gcc, getToolChain(OutputSystem::Build)); + uUNIT_ASSERT_EQUAL(ToolChain::gcc, getToolChain(OutputSystem::Build)); conf_build_cxx = "/usr/bin/clang++"; - uASSERT_EQUAL(ToolChain::clang, getToolChain(OutputSystem::Build)); + uUNIT_ASSERT_EQUAL(ToolChain::clang, getToolChain(OutputSystem::Build)); conf_build_cxx = "/usr/bin/clang++-10"; - uASSERT_EQUAL(ToolChain::clang, getToolChain(OutputSystem::Build)); + uUNIT_ASSERT_EQUAL(ToolChain::clang, getToolChain(OutputSystem::Build)); conf_build_cxx = "/usr/lib/llvm/12/bin/i686-pc-linux-gnu-clang++-12"; - uASSERT_EQUAL(ToolChain::clang, getToolChain(OutputSystem::Build)); + uUNIT_ASSERT_EQUAL(ToolChain::clang, getToolChain(OutputSystem::Build)); } void getOption_toolchain_test() -- cgit v1.2.3