diff options
author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-11-02 14:31:01 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-02 14:31:08 (GMT) |
commit | 89310efa4aa82213a5fd74917b565a2819ed2b0f (patch) | |
tree | 5ada02ee72a657ba2fbf6a53c58bac2c3d2c67fa /Tests | |
parent | 4a266a2679b1b7ccd2e5db8f6c0cd1c389149522 (diff) | |
parent | 8c42cfb2e87c97cbf52eef67f45af0206f0a923e (diff) | |
download | CMake-89310efa4aa82213a5fd74917b565a2819ed2b0f.zip CMake-89310efa4aa82213a5fd74917b565a2819ed2b0f.tar.gz CMake-89310efa4aa82213a5fd74917b565a2819ed2b0f.tar.bz2 |
Merge topic 'fix-test-for-qemu'
8c42cfb2e8 test/CMakeLib: make testUVProcessChain work with qemu
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5442
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/CMakeLib/testUVProcessChain.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
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) { |