From: Magnus Jacobsson <magnus.jacobsson@berotec.se>
Date: Mon, 17 Aug 2020 17:40:55 +0000 (+0200)
Subject: Refactor some code to be the same for cmake & msbuild
X-Git-Tag: 2.46.0~20^2^2~111^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=acf1bb3eb7a5c2f266ade4843677026f9a0b4882;p=graphviz

Refactor some code to be the same for cmake & msbuild
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e92bf9e7b..97fbfa5a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,19 +134,17 @@ portable-source:
               ./graphviz-install.exe /S /D=$env:graphviz_install_dir | Out-Null;
               mv graphviz-install.exe graphviz-install-$Env:GV_VERSION-$API.exe;
               $env:Path += ";" + $env:graphviz_install_dir + "\bin"
-              dot -c;
               cd ..;
               $Env:INCLUDE += ";C:\Graphviz\include";
               $Env:LIB += ";C:\Graphviz\lib";
-              python3 -m pytest --junitxml=report.xml tests rtest
             }
             elseif($env:build_system -eq "msbuild") {
               # Append build destination to the PATH, configure dot and execute regression tests
               # 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;
-              python3 -m pytest --junitxml=report.xml tests rtest
             }
+        - dot -c
+        - python3 -m pytest --junitxml=report.xml tests rtest
         # Create artifacts to archive
         - $ID = "windows"
         - $VERSION_ID = "10"