diff --git a/contrib/source-control-tools/CMakeLists.txt b/contrib/source-control-tools/CMakeLists.txt index 0f5d29fe1..6c092b082 100644 --- a/contrib/source-control-tools/CMakeLists.txt +++ b/contrib/source-control-tools/CMakeLists.txt @@ -1,24 +1,25 @@ # Copyright (c) 2019 The Bitcoin developers add_custom_target(check-source-control-tools) include(DoOrFail) find_program_or_fail(BASH_EXECUTABLE bash) set(SOURCE_CONTROL_TOOLS_TESTS test/test-autopatch.sh - test/test-sanitize-conduit-token.sh test/test-check-revision-accepted.sh + test/test-land-patch.sh + test/test-sanitize-conduit-token.sh ) foreach(TEST ${SOURCE_CONTROL_TOOLS_TESTS}) get_filename_component(FILENAME ${TEST} NAME) set(TESTNAME "check-source-control-tools-${FILENAME}") add_custom_target(${TESTNAME} COMMAND "${BASH_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/${TEST}" ) add_dependencies(check-source-control-tools ${TESTNAME}) endforeach() diff --git a/contrib/source-control-tools/land-patch.sh b/contrib/source-control-tools/land-patch.sh index 7c9e99580..12b19e33c 100755 --- a/contrib/source-control-tools/land-patch.sh +++ b/contrib/source-control-tools/land-patch.sh @@ -1,56 +1,64 @@ #!/usr/bin/env bash # Copyright (c) 2020 The Bitcoin developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 set -euxo pipefail help_message() { cat <