Skip to content

Commit a5e9966

Browse files
committed
Merge bitcoin#30733: test: remove unused src_dir param from run_tests after CMake migration
2ad5601 Remove unused src_dir param from run_tests (Lőrinc) Pull request description: The `src_dir` usage was removed in bitcoin@a8a2e36#diff-437d7f6e9f2229879b60aae574a8217f14c643bbf3cfa9225d8011d6d52df00cL598, making the parameter unused. Top commit has no ACKs. Tree-SHA512: 1fd8b93811b4ab467ba5a160a4fe204e9606e1bf237c7595ed6f8b7821cf59d2a776c0e1e154852a45b2a35e5bdbd8996314e4f63a9c750f21b9a17875cb636a
2 parents 0c1e507 + 2ad5601 commit a5e9966

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

test/functional/test_runner.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,6 @@ def print_warning_missing_test(test_name):
569569

570570
run_tests(
571571
test_list=test_list,
572-
src_dir=config["environment"]["SRCDIR"],
573572
build_dir=config["environment"]["BUILDDIR"],
574573
tmpdir=tmpdir,
575574
jobs=args.jobs,
@@ -581,7 +580,7 @@ def print_warning_missing_test(test_name):
581580
results_filepath=results_filepath,
582581
)
583582

584-
def run_tests(*, test_list, src_dir, build_dir, tmpdir, jobs=1, enable_coverage=False, args=None, combined_logs_len=0, failfast=False, use_term_control, results_filepath=None):
583+
def run_tests(*, test_list, build_dir, tmpdir, jobs=1, enable_coverage=False, args=None, combined_logs_len=0, failfast=False, use_term_control, results_filepath=None):
585584
args = args or []
586585

587586
# Warn if bitcoind is already running
@@ -604,7 +603,7 @@ def run_tests(*, test_list, src_dir, build_dir, tmpdir, jobs=1, enable_coverage=
604603
print(f"{BOLD[1]}WARNING!{BOLD[0]} There may be insufficient free space in {tmpdir} to run the Bitcoin functional test suite. "
605604
f"Running the test suite with fewer than {min_space // (1024 * 1024)} MB of free space might cause tests to fail.")
606605

607-
tests_dir = build_dir + '/test/functional/'
606+
tests_dir = f"{build_dir}/test/functional/"
608607
# This allows `test_runner.py` to work from an out-of-source build directory using a symlink,
609608
# a hard link or a copy on any platform. See https://github.com/bitcoin/bitcoin/pull/27561.
610609
sys.path.append(tests_dir)

0 commit comments

Comments
 (0)