mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-12 06:58:57 +01:00
scripted-diff: test: Move setup_common to test library
-BEGIN VERIFY SCRIPT- # Move files for f in $(git ls-files src/test/lib/); do git mv $f src/test/util/; done git mv src/test/setup_common.cpp src/test/util/ git mv src/test/setup_common.h src/test/util/ # Replace Windows paths sed -i -e 's|\\setup_common|\\util\\setup_common|g' $(git grep -l '\\setup_common') sed -i -e 's|src\\test\\lib\\|src\\test\\util\\|g' build_msvc/test_bitcoin/test_bitcoin.vcxproj # Everything else sed -i -e 's|/setup_common|/util/setup_common|g' $(git grep -l 'setup_common') sed -i -e 's|test/lib/|test/util/|g' $(git grep -l 'test/lib/') # Fix include guard sed -i -e 's|BITCOIN_TEST_SETUP_COMMON_H|BITCOIN_TEST_UTIL_SETUP_COMMON_H|g' ./src/test/util/setup_common.h sed -i -e 's|BITCOIN_TEST_LIB_|BITCOIN_TEST_UTIL_|g' $(git grep -l 'BITCOIN_TEST_LIB_') -END VERIFY SCRIPT-
This commit is contained in:
32
src/test/util/logging.cpp
Normal file
32
src/test/util/logging.cpp
Normal file
@@ -0,0 +1,32 @@
|
||||
// Copyright (c) 2019 The Bitcoin Core developers
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#include <test/util/logging.h>
|
||||
|
||||
#include <logging.h>
|
||||
#include <noui.h>
|
||||
#include <tinyformat.h>
|
||||
#include <util/memory.h>
|
||||
|
||||
#include <stdexcept>
|
||||
|
||||
DebugLogHelper::DebugLogHelper(std::string message)
|
||||
: m_message{std::move(message)}
|
||||
{
|
||||
m_print_connection = LogInstance().PushBackCallback(
|
||||
[this](const std::string& s) {
|
||||
if (m_found) return;
|
||||
m_found = s.find(m_message) != std::string::npos;
|
||||
});
|
||||
noui_test_redirect();
|
||||
}
|
||||
|
||||
void DebugLogHelper::check_found()
|
||||
{
|
||||
noui_reconnect();
|
||||
LogInstance().DeleteCallback(m_print_connection);
|
||||
if (!m_found) {
|
||||
throw std::runtime_error(strprintf("'%s' not found in debug log\n", m_message));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user