From fa0937de35176fdcf637e1af16be4469725e60cc Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 2 Sep 2021 10:49:21 +0200
Subject: [PATCH] test: Rename bitcoin-util-test.py to util/test_runner.py

To normalize the name of all three test runners (fuzz, functional, util).
---
 .appveyor.yml                                      | 2 +-
 Makefile.am                                        | 2 +-
 configure.ac                                       | 2 +-
 src/Makefile.test.include                          | 4 ++--
 test/README.md                                     | 2 +-
 test/config.ini.in                                 | 2 +-
 test/util/{bitcoin-util-test.py => test_runner.py} | 0
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename test/util/{bitcoin-util-test.py => test_runner.py} (100%)

diff --git a/.appveyor.yml b/.appveyor.yml
index 3ca7818ecad..a85ec4c3803 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -51,7 +51,7 @@ after_build:
 test_script:
 - cmd: src\test_bitcoin.exe -l test_suite
 - cmd: src\bench_bitcoin.exe > NUL
-- ps:  python test\util\bitcoin-util-test.py
+- ps:  python test\util\test_runner.py
 - cmd: python test\util\rpcauth-test.py
 # Fee estimation test failing on appveyor with: WinError 10048] Only one usage of each socket address (protocol/network address/port) is normally permitted.
 # functional tests disabled for now. See
diff --git a/Makefile.am b/Makefile.am
index 79c294fd158..ce663319102 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -286,7 +286,7 @@ EXTRA_DIST += \
     test/fuzz
 
 EXTRA_DIST += \
-    test/util/bitcoin-util-test.py \
+    test/util/test_runner.py \
     test/util/data/bitcoin-util-test.json \
     test/util/data/blanktxv1.hex \
     test/util/data/blanktxv1.json \
diff --git a/configure.ac b/configure.ac
index 6c867986c9c..f03025d3c15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1874,7 +1874,7 @@ AC_CONFIG_LINKS([contrib/devtools/test-symbol-check.py:contrib/devtools/test-sym
 AC_CONFIG_LINKS([contrib/filter-lcov.py:contrib/filter-lcov.py])
 AC_CONFIG_LINKS([test/functional/test_runner.py:test/functional/test_runner.py])
 AC_CONFIG_LINKS([test/fuzz/test_runner.py:test/fuzz/test_runner.py])
-AC_CONFIG_LINKS([test/util/bitcoin-util-test.py:test/util/bitcoin-util-test.py])
+AC_CONFIG_LINKS([test/util/test_runner.py:test/util/test_runner.py])
 AC_CONFIG_LINKS([test/util/rpcauth-test.py:test/util/rpcauth-test.py])
 
 dnl boost's m4 checks do something really nasty: they export these vars. As a
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 6af5ead4432..a85a3599601 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -337,8 +337,8 @@ bitcoin_test_clean : FORCE
 
 check-local: $(BITCOIN_TESTS:.cpp=.cpp.test)
 if BUILD_BITCOIN_TX
-	@echo "Running test/util/bitcoin-util-test.py..."
-	$(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py
+	@echo "Running test/util/test_runner.py..."
+	$(PYTHON) $(top_builddir)/test/util/test_runner.py
 endif
 	@echo "Running test/util/rpcauth-test.py..."
 	$(PYTHON) $(top_builddir)/test/util/rpcauth-test.py
diff --git a/test/README.md b/test/README.md
index edff9d433e4..412d5ae1062 100644
--- a/test/README.md
+++ b/test/README.md
@@ -261,7 +261,7 @@ For ways to generate more granular profiles, see the README in
 
 ### Util tests
 
-Util tests can be run locally by running `test/util/bitcoin-util-test.py`.
+Util tests can be run locally by running `test/util/test_runner.py`.
 Use the `-v` option for verbose output.
 
 ### Lint tests
diff --git a/test/config.ini.in b/test/config.ini.in
index e3872181cd0..db80bba6f1a 100644
--- a/test/config.ini.in
+++ b/test/config.ini.in
@@ -3,7 +3,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 # These environment variables are set by the build process and read by
-# test/functional/test_runner.py and test/util/bitcoin-util-test.py
+# test/*/test_runner.py and test/util/rpcauth-test.py
 
 [environment]
 PACKAGE_NAME=@PACKAGE_NAME@
diff --git a/test/util/bitcoin-util-test.py b/test/util/test_runner.py
similarity index 100%
rename from test/util/bitcoin-util-test.py
rename to test/util/test_runner.py