From 8c42cfb2e87c97cbf52eef67f45af0206f0a923e Mon Sep 17 00:00:00 2001 From: Eicke Herbertz Date: Thu, 29 Oct 2020 19:10:08 +0100 Subject: test/CMakeLib: make testUVProcessChain work with qemu When building and testing CMake in a container with qemu user mode emulation, the expected termination with std::abort() in testUVProcessChainHelper leads qemu to emit an additional message about an uncaught signal. There appears to be no way to make qemu shut up, so any qemu message will be removed from the output during validation. --- Tests/CMakeLib/testUVProcessChain.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Tests/CMakeLib/testUVProcessChain.cxx b/Tests/CMakeLib/testUVProcessChain.cxx index 61a77cf..a003205 100644 --- a/Tests/CMakeLib/testUVProcessChain.cxx +++ b/Tests/CMakeLib/testUVProcessChain.cxx @@ -181,6 +181,10 @@ bool checkOutput(std::istream& outputStream, std::istream& errorStream) } std::string error = getInput(errorStream); + auto qemu_error_pos = error.find("qemu:"); + if (qemu_error_pos != std::string::npos) { + error.resize(qemu_error_pos); + } if (error.length() != 3 || error.find('1') == std::string::npos || error.find('2') == std::string::npos || error.find('3') == std::string::npos) { -- cgit v0.12