Skip to content

Commit a927d5c

Browse files
committed
Merge bitcoin#27228: test: exempt previous release binaries from valgrind
850670e 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 850670e Tree-SHA512: ebdf461083f1292528e6619963b910f486b60b4f6b183f0aea2c8bfcafa98caeb204d138700cd288450643bcec5e49e12b89f2f7537fccdf495a2a33acd9cea0
2 parents 4a5aae9 + 850670e commit a927d5c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

test/functional/test_framework/test_framework.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def parse_args(self):
185185
parser.add_argument("--perf", dest="perf", default=False, action="store_true",
186186
help="profile running nodes with perf for the duration of the test")
187187
parser.add_argument("--valgrind", dest="valgrind", default=False, action="store_true",
188-
help="run nodes under the valgrind memory error detector: expect at least a ~10x slowdown. valgrind 3.14 or later required.")
188+
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.")
189189
parser.add_argument("--randomseed", type=int,
190190
help="set a random seed for deterministically reproducing a previous test run")
191191
parser.add_argument("--timeout-factor", dest="timeout_factor", type=float, help="adjust test timeouts by a factor. Setting it to 0 disables all timeouts")

test/functional/test_framework/test_node.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ def __init__(self, i, datadir_path, *, chain, rpchost, timewait, timeout_factor,
110110
if self.descriptors is None:
111111
self.args.append("-disablewallet")
112112

113-
if use_valgrind:
113+
# Use valgrind, expect for previous release binaries
114+
if use_valgrind and version is None:
114115
default_suppressions_file = Path(__file__).parents[3] / "contrib" / "valgrind.supp"
115116
suppressions_file = os.getenv("VALGRIND_SUPPRESSIONS_FILE",
116117
default_suppressions_file)

0 commit comments

Comments
 (0)