X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fconfig.py;h=b8bbbbcde7c6ba6a64e097a8adb92c50b9f694e8;hb=b29c60660a69ae892495de65e8c5147052c84ef5;hp=c99d1ca66a629866112b0071db8ab27efcc4c77e;hpb=d9b0c6fbf7aa5bd9af84264105b39c82028a4a29;p=vpp.git diff --git a/test/config.py b/test/config.py index c99d1ca66a6..b8bbbbcde7c 100644 --- a/test/config.py +++ b/test/config.py @@ -1,7 +1,6 @@ import argparse import os import psutil -import textwrap import time @@ -119,7 +118,7 @@ parser.add_argument( "--failed-dir", action="store", type=directory, - help="directory containing failed tests", + help="directory containing failed tests (default: --tmp-dir)", ) filter_help_string = """\ @@ -357,8 +356,7 @@ parser.add_argument( "--keep-pcaps", action="store_true", default=default_keep_pcaps, - help="if set, keep all pcap files from a test run" - f" (default: {default_keep_pcaps})", + help=f"if set, keep all pcap files from a test run (default: {default_keep_pcaps})", ) config = parser.parse_args() @@ -397,7 +395,10 @@ config.test_src_dir = test_dirs if config.venv_dir is None: - config.venv_dir = f"{ws}/test/venv" + config.venv_dir = f"{ws}/build-root/test/venv" + +if config.failed_dir is None: + config.failed_dir = f"{config.tmp_dir}" available_cpus = psutil.Process().cpu_affinity() num_cpus = len(available_cpus)