From 7183b2cae90ee27cb1213bf8011f70c325aaa0a6 Mon Sep 17 00:00:00 2001 From: Jacob Lifshay Date: Mon, 12 Jun 2023 18:59:01 -0700 Subject: [PATCH] use new pytest config --- .gitignore | 3 ++- .gitlab-ci.yml | 8 +++++++- pyproject.toml | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f288a6df..c33514db 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ __pycache__ *.egg-info *.gtkw /formal_test_temp -/sim_test_out \ No newline at end of file +/sim_test_out +/test-out diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 561c7bb1..526e795b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ build: - ccache --show-stats || true - python3 -m venv --system-site-packages .venv - . .venv/bin/activate - - pip install pytest-xdist twine cython + - pip install pytest-xdist==3.3.1 pytest==7.3.1 twine cython script: - . .venv/bin/activate @@ -123,6 +123,12 @@ build: - python3 setup.py develop - popd + - git clone --depth 1 https://git.libre-soc.org/git/pytest-output-to-files.git pytest-output-to-files + - pushd pytest-output-to-files + - git rev-parse HEAD + - python3 setup.py develop + - popd + - python3 setup.py develop - pytest -v diff --git a/pyproject.toml b/pyproject.toml index 267ae9af..4862ddbd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,10 +3,11 @@ minversion = "6.0" python_classes = "" python_functions = "" testpaths = ["src/ieee754"] -required_plugins = ["pytest-xdist>=1.0.0"] +required_plugins = ["pytest-xdist>=1.0.0", "pytest-output-to-files>=0.1.0"] addopts = [ "-n", "auto", + "--shorten-output-dir=test-out", "--ignore", "src/ieee754/add/test_dual.py", "--ignore", -- 2.30.2