Replace regression_tests.ps1 with direct call to pytest

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4be50d190309cb7151168dd61f1cfb7faca2765..da53b9c382a266501d68883e3fa54850fe89a523 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,9 +144,7 @@ portable-source:
               # The following is per https://gitlab.com/graphviz/graphviz/-/merge_requests/1345
               $env:Path = $env:CI_PROJECT_DIR + "\" + $env:configuration + "\Graphviz\bin" + ";" + $env:Path;
               dot -c;
-              cd tests\regression_tests;
-              ./regression_tests.ps1;
-              cd ..\..;
+              python3 -m pytest --junitxml=report.xml tests\regression_tests\shapes tests\regression_tests\large
             }
         # Create artifacts to archive
         - $ID = "windows"

diff --git a/tests/regression_tests/regression_tests.ps1 b/tests/regression_tests/regression_tests.ps1
deleted file mode 100644 (file)
index ba146df..0000000
--- a/tests/regression_tests/regression_tests.ps1
+++ /dev/null
@@ -1,10 +0,0 @@
-Push-Location shapes
-python shapes.py
-Pop-Location
-
-# Larger graph testing
-# Python unittest prints to stderr, but Powershell interprets stderr
-# messages as an error, failing the pipeline. So we must redirect
-# stderr to stdout. The line noise at the end does so. See
-# https://stackoverflow.com/a/20950421/171898 for explanation.
-python -m pytest large 2>&1 | %{ "$_" }