CI: enable Smyrna on Ubuntu CMake jobs

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2924059df56efcd2d5393463d66e7802a1860530..df88b199ea6bca8ab663e93d7d63c79b4c057789 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -702,6 +702,7 @@ ubuntu18-04-cmake-build:
         # fail on any compiler warnings
         - export CFLAGS=-Werror
         - export CXXFLAGS=-Werror
+        - export CMAKE_OPTIONS="-Dwith_smyrna=ON"
     tags:
         - linux
     variables:
@@ -718,6 +719,7 @@ ubuntu21-04-cmake-build:
         - export CFLAGS=-Werror
         - export CXXFLAGS=-Werror
         - export CMAKE_OPTIONS="-Dwith_cxx_tests=ON -Dwith_cxx_api=ON"
+        - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Dwith_smyrna=ON"
     tags:
         - linux
     variables:
@@ -734,6 +736,7 @@ ubuntu21-10-cmake-build:
         - export CFLAGS=-Werror
         - export CXXFLAGS=-Werror
         - export CMAKE_OPTIONS="-Dwith_cxx_tests=ON -Dwith_cxx_api=ON"
+        - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Dwith_smyrna=ON"
     tags:
         - linux
     variables:
@@ -798,6 +801,7 @@ ubuntu21-04-cmake-ASan-build-for-ctest:
         - export CFLAGS=-Werror
         - export CXXFLAGS=-Werror
         - export CMAKE_OPTIONS="-Duse_sanitizers=ON -Duse_coverage=ON -Dwith_cxx_tests=ON -Dwith_cxx_api=ON"
+        - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Dwith_smyrna=ON"
     # override the deb_build_definition artifacts since we need more
     # files from the build directory when running ctest in the test
     # stage.
@@ -841,6 +845,7 @@ ubuntu21-10-cmake-ASan-build-for-ctest:
         - export CFLAGS=-Werror
         - export CXXFLAGS=-Werror
         - export CMAKE_OPTIONS="-Duse_sanitizers=ON -Duse_coverage=ON -Dwith_cxx_tests=ON -Dwith_cxx_api=ON"
+        - export CMAKE_OPTIONS="$CMAKE_OPTIONS -Dwith_smyrna=ON"
     # override the deb_build_definition artifacts since we need more
     # files from the build directory when running ctest in the test
     # stage.

diff --git a/ci/tests.py b/ci/tests.py
index 4d9c8777bbf49c4fac0731cfd5391d44d28e8f08..b097773b25fe78e57197afbf8ec1f10f22abe113 100644 (file)
--- a/ci/tests.py
+++ b/ci/tests.py
@@ -110,7 +110,6 @@ def test_existence(binary: str):
     "gxl2dot",
     "lneato",
     "prune",
-    "smyrna",
     "vimdot",
   ]
 
@@ -175,6 +174,11 @@ def test_existence(binary: str):
     check_that_tool_does_not_exist(binary, os_id)
     pytest.skip(f"{binary} is not built on 64-bit Windows due to lacking libgd")
 
+  # FIXME: Smyrna dependencies are not avaiable in other jobs
+  if binary == "smyrna" and is_cmake() and platform.system() != "Linux":
+    check_that_tool_does_not_exist(binary, os_id)
+    pytest.skip("smyrna is not built on non-Linux due to lacking dependencies")
+
   assert shutil.which(binary) is not None
 
 def check_that_tool_does_not_exist(tool, os_id):