Merge bitcoin/bitcoin#34679: ci: Download script_assets_test.json for Windows CI
fa7612f253ci: Download script_assets_test.json for Windows CI (MarcoFalke)7777a13306test: Move Fetching-print to download_from_url util (MarcoFalke)faf96286cetest: move-only download_from_url to stand-alone util file (MarcoFalke)fa0cc1c5a4test: [doc] Remove outdated comment (MarcoFalke) Pull request description: Fixes https://github.com/bitcoin/bitcoin/issues/34670 by adding a new `download_script_assets` Python helper and calling it. ACKs for top commit: hebasto: re-ACKfa7612f253. janb84: re ACKfa7612f253hodlinator: utACKfa7612f253Tree-SHA512: 73c2cb3a31f231174566fb880b82de92734b1679ef000f8d793d774b7e5f5a7b8c7994a3998ca78821115bdc80c16aada69cf596e92c083cf9b9a95c7cee16ea
This commit is contained in:
5 files changed
+91
-54
No files matched your search
@@ -10,6 +10,9 @@ import subprocess
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
sys.path.append(str(Path(__file__).resolve().parent.parent / "test"))
|
||||
from download_utils import download_script_assets
|
||||
|
||||
|
||||
def run(cmd, **kwargs):
|
||||
print("+ " + shlex.join(cmd), flush=True)
|
||||
@@ -81,6 +84,9 @@ def prepare_tests():
|
||||
run(cmd_download_prev_rel)
|
||||
run([sys.executable, "-m", "pip", "install", "pyzmq"])
|
||||
|
||||
dest = workspace / "unit_test_data"
|
||||
download_script_assets(dest)
|
||||
|
||||
|
||||
def run_functional_tests():
|
||||
workspace = Path.cwd()
|
||||
@@ -117,6 +123,8 @@ def run_functional_tests():
|
||||
|
||||
|
||||
def run_unit_tests():
|
||||
workspace = Path.cwd()
|
||||
os.environ["DIR_UNIT_TEST_DATA"] = str(workspace / "unit_test_data")
|
||||
# Can't use ctest here like other jobs as we don't have a CMake build tree.
|
||||
commands = [
|
||||
["./bin/test_bitcoin-qt.exe"],
|
||||
|
||||
Reference in new issue
Block a user