[Setup] Removing direct calls of setup.py

Xilinx · Oct 6, 2023 · d8a4048 · d8a4048
1 parent aac2704
commit d8a4048
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/docker/quicktest.sh b/docker/quicktest.sh
@@ -6,16 +6,16 @@ cd $FINN_ROOT
 # check if command line argument is empty or not present
 if [ -z $1 ]; then
   echo "Running quicktest: not (vivado or slow or board) with pytest-xdist"
-  python setup.py test --addopts "-m 'not (vivado or slow or vitis or board or notebooks)' --dist=loadfile -n $PYTEST_PARALLEL"
+  pytest -m 'not (vivado or slow or vitis or board or notebooks)' --dist=loadfile -n $PYTEST_PARALLEL
 elif [ $1 = "main" ]; then
   echo "Running main test suite: not (rtlsim or end2end) with pytest-xdist"
-  python setup.py test --addopts "-k 'not (rtlsim or end2end)' --dist=loadfile -n $PYTEST_PARALLEL"
+  pytest -k 'not (rtlsim or end2end)' --dist=loadfile -n $PYTEST_PARALLEL
 elif [ $1 = "rtlsim" ]; then
   echo "Running rtlsim test suite with pytest-parallel"
-  python setup.py test --addopts "-k rtlsim --workers $PYTEST_PARALLEL"
+  pytest -k rtlsim --workers $PYTEST_PARALLEL
 elif [ $1 = "end2end" ]; then
   echo "Running end2end test suite with no parallelism"
-  python setup.py test --addopts "-k end2end"
+  pytest -k end2end
 elif [ $1 = "full" ]; then
   echo "Running full test suite, each step with appropriate parallelism"
   $0 main;

diff --git a/run-docker.sh b/run-docker.sh
@@ -102,7 +102,7 @@ DOCKER_INTERACTIVE=""
 
 if [ "$1" = "test" ]; then
   gecho "Running test suite (all tests)"
-  DOCKER_CMD="python setup.py test"
+  DOCKER_CMD="pytest"
 elif [ "$1" = "quicktest" ]; then
   gecho "Running test suite (non-Vivado, non-slow tests)"
   DOCKER_CMD="quicktest.sh"