Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#30733: test: remove unused src_dir param from r…
Browse files Browse the repository at this point in the history
…un_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/bitcoin@a8a2e36#diff-437d7f6e9f2229879b60aae574a8217f14c643bbf3cfa9225d8011d6d52df00cL598, making the parameter unused.

Top commit has no ACKs.

Tree-SHA512: 1fd8b93811b4ab467ba5a160a4fe204e9606e1bf237c7595ed6f8b7821cf59d2a776c0e1e154852a45b2a35e5bdbd8996314e4f63a9c750f21b9a17875cb636a
  • Loading branch information
fanquake committed Sep 12, 2024
2 parents 0c1e507 + 2ad5601 commit a5e9966
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions test/functional/test_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,6 @@ def print_warning_missing_test(test_name):

run_tests(
test_list=test_list,
src_dir=config["environment"]["SRCDIR"],
build_dir=config["environment"]["BUILDDIR"],
tmpdir=tmpdir,
jobs=args.jobs,
Expand All @@ -581,7 +580,7 @@ def print_warning_missing_test(test_name):
results_filepath=results_filepath,
)

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):
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):
args = args or []

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

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

0 comments on commit a5e9966

Please sign in to comment.