/build-root/rpmbuild/
/build-root/test-doc/
/build-root/test-cov/
+/build-root/test/
/test/run/
/test/build/
/test/coverage/
-/test/venv/
/test/vapi_test/
/test/doc/build/
/build-config.mk
FORCE_FOREGROUND=1
endif
-VENV_PATH=$(TEST_DIR)/venv
+VENV_BR_DIR=$(BR)/test
+VENV_PATH=$(VENV_BR_DIR)/venv
ifeq ($(TEST_DEBUG),1)
VENV_RUN_DIR:=$(VENV_PATH)/run-debug
.PHONY: wipe
wipe: reset
- @rm -rf $(VENV_PATH)
+ @rm -rf $(VENV_BR_DIR)
@rm -rf $(patsubst %,%/__pycache__, $(VPP_TEST_DIRS))
$(BUILD_COV_DIR):
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}"
import argparse
-def discover_tests(directory, callback, ignore_path):
+def discover_tests(directory, callback):
do_insert = True
for _f in os.listdir(directory):
f = "%s/%s" % (directory, _f)
if os.path.isdir(f):
- if ignore_path is not None and f.startswith(ignore_path):
- continue
- discover_tests(f, callback, ignore_path)
+ discover_tests(f, callback)
continue
if not os.path.isfile(f):
continue
filter_cb = FilterByTestOption(filter_file, filter_class, filter_func)
- ignore_path = config.venv_dir
cb = SplitToSuitesCallback(filter_cb)
for d in config.test_src_dir:
print("Adding tests from directory tree %s" % d)
- discover_tests(d, cb, ignore_path)
+ discover_tests(d, cb)
# suites are not hashable, need to use list
suites = []
if [ -z "$venv_dir" ]
then
- venv_dir="$ws_dir/test/venv"
+ venv_dir="$ws_dir/build-root/test/venv"
echo "Argument --venv-path not specified, defaulting to '$venv_dir'"
extra_args="$extra_args --venv-dir=$venv_dir"
fi