Skip to content

Commit 41e6909

Browse files
committed
Merge bitcoin/bitcoin#23516: test: Force --nosandbox when --valgrind
fa9c26a test: Force --nosandbox when --valgrind (MarcoFalke) Pull request description: The two options are mutually exclusive and will result in a test failure. Fix that. Can be tested with: ``` $ ./test/functional/wallet_disable.py --valgrind ACKs for top commit: fanquake: ACK fa9c26a Tree-SHA512: 7d1c36c1b6627ca041757eb0515a0d6cc962a56d783ee4f5647a2ddc2d104491f0586a8ea0b8acebe0a203190f4f5567b349123dfd4c181bcc63361174a8ab63
2 parents caf8b26 + fa9c26a commit 41e6909

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

test/functional/test_framework/test_framework.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def __init__(self):
101101
self.supports_cli = True
102102
self.bind_to_localhost_only = True
103103
self.parse_args()
104-
self.disable_syscall_sandbox = self.options.nosandbox
104+
self.disable_syscall_sandbox = self.options.nosandbox or self.options.valgrind
105105
self.default_wallet_name = "default_wallet" if self.options.descriptors else ""
106106
self.wallet_data_filename = "wallet.dat"
107107
# Optional list of wallet names that can be set in set_test_params to
@@ -188,7 +188,7 @@ def parse_args(self):
188188
parser.add_argument("--perf", dest="perf", default=False, action="store_true",
189189
help="profile running nodes with perf for the duration of the test")
190190
parser.add_argument("--valgrind", dest="valgrind", default=False, action="store_true",
191-
help="run nodes under the valgrind memory error detector: expect at least a ~10x slowdown, valgrind 3.14 or later required")
191+
help="run nodes under the valgrind memory error detector: expect at least a ~10x slowdown. valgrind 3.14 or later required. Forces --nosandbox.")
192192
parser.add_argument("--randomseed", type=int,
193193
help="set a random seed for deterministically reproducing a previous test run")
194194
parser.add_argument('--timeout-factor', dest="timeout_factor", type=float, default=1.0, help='adjust test timeouts by a factor. Setting it to 0 disables all timeouts')

0 commit comments

Comments
 (0)