diff options
author | fanquake <fanquake@gmail.com> | 2023-10-12 11:46:33 +0200 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2023-10-12 11:53:15 +0200 |
commit | a927d5cabefbb3d2c60d69d6314cb0b768431dac (patch) | |
tree | 5cf194abd64e9f07b9953bb7a730532e23662297 | |
parent | 4a5aae9330780c3740e27cc511f7cba1fab745b9 (diff) | |
parent | 850670e3d63ed7d04b417a43cb8ab06292aa2c23 (diff) |
Merge bitcoin/bitcoin#27228: test: exempt previous release binaries from valgrind
850670e3d63ed7d04b417a43cb8ab06292aa2c23 test: don't run old binaries under valgrind (Sjors Provoost)
Pull request description:
Some, but not all, backward compatibility tests fail for me and it seems useless to run old release binaries under valgrind anyway.
Can be tested by running `test/functional/feature_txindex_compatibility.py --valgrind --timeout-factor=10` with and without this PR.
—
The previous version of this PR disabled these test entirely under valgrind. The current version does run the test, but starts the old binaries without valgrind.
ACKs for top commit:
maflcko:
lgtm ACK 850670e3d63ed7d04b417a43cb8ab06292aa2c23
Tree-SHA512: ebdf461083f1292528e6619963b910f486b60b4f6b183f0aea2c8bfcafa98caeb204d138700cd288450643bcec5e49e12b89f2f7537fccdf495a2a33acd9cea0
-rwxr-xr-x | test/functional/test_framework/test_framework.py | 2 | ||||
-rwxr-xr-x | test/functional/test_framework/test_node.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index 50444b95bb..4e6d245b5f 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -185,7 +185,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): parser.add_argument("--perf", dest="perf", default=False, action="store_true", help="profile running nodes with perf for the duration of the test") parser.add_argument("--valgrind", dest="valgrind", default=False, action="store_true", - help="run nodes under the valgrind memory error detector: expect at least a ~10x slowdown. valgrind 3.14 or later required.") + help="run nodes under the valgrind memory error detector: expect at least a ~10x slowdown. valgrind 3.14 or later required. Does not apply to previous release binaries.") parser.add_argument("--randomseed", type=int, help="set a random seed for deterministically reproducing a previous test run") parser.add_argument("--timeout-factor", dest="timeout_factor", type=float, help="adjust test timeouts by a factor. Setting it to 0 disables all timeouts") diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py index fc92aa445a..4d7adf322c 100755 --- a/test/functional/test_framework/test_node.py +++ b/test/functional/test_framework/test_node.py @@ -110,7 +110,8 @@ class TestNode(): if self.descriptors is None: self.args.append("-disablewallet") - if use_valgrind: + # Use valgrind, expect for previous release binaries + if use_valgrind and version is None: default_suppressions_file = Path(__file__).parents[3] / "contrib" / "valgrind.supp" suppressions_file = os.getenv("VALGRIND_SUPPRESSIONS_FILE", default_suppressions_file) |