Add clang preset

Author: dmnks

.github/workflows/linux.yml

@@ -18,7 +18,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Build the Fedora testing environment
+      - name: Build the Fedora testing environment (clang)
+        run: ./mktree.oci build --preset clang
+        working-directory: ./tests
+      - name: Build the Fedora testing environment (gcc)
+        # This replaces the previous clang based image
         run: ./mktree.oci build
         working-directory: ./tests
       - name: Fix kernel mmap rnd bits

CMakePresets.json

@@ -2,12 +2,9 @@
     "version": 10,
     "configurePresets": [
         {
-            "name": "ci-gcc",
-            "displayName": "CI config using GNU C compiler",
+            "name": "ci-default",
+            "displayName": "Default CI config",
             "cacheVariables": {
-                "ENABLE_WERROR": "ON",
-                "ENABLE_ASAN": "ON",
-                "ENABLE_UBSAN": "ON",
                 "ENABLE_BDB_RO": "ON",
                 "WITH_FSVERITY": "ON",
                 "WITH_IMAEVM": "ON",
@@ -19,6 +16,28 @@
                 "CFLAGS": "-Og -g",
                 "CXXFLAGS": "-Og -g"
             }
+        },
+        {
+            "name": "ci-gcc",
+            "inherits": "ci-default",
+            "displayName": "GNU C based CI config",
+            "cacheVariables": {
+                "ENABLE_WERROR": "ON",
+                "ENABLE_ASAN": "ON",
+                "ENABLE_UBSAN": "ON"
+            }
+        },
+        {
+            "name": "ci-clang",
+            "inherits": "ci-default",
+            "displayName": "Clang based CI config",
+            "cacheVariables": {
+                "CMAKE_C_COMPILER": "clang",
+                "CMAKE_CXX_COMPILER": "clang++",
+                "ENABLE_WERROR": "OFF",
+                "ENABLE_ASAN": "OFF",
+                "ENABLE_UBSAN": "OFF"
+            }
         }
     ]
 }

tests/Dockerfile.fedora

@@ -58,7 +58,9 @@ RUN dnf -y install \
   sequoia-sq \
   libasan \
   libubsan \
-  nss-altfiles
+  nss-altfiles \
+  clang \
+  libomp-devel
 # If updates to specific packages are needed, do it here
 # RUN dnf -y --enablerepo=updates install ...
 
@@ -93,12 +95,13 @@ WORKDIR /
 CMD /bin/bash
 
 FROM base AS full
+ARG CMAKE_PRESET=ci-gcc
 
 WORKDIR /srv/rpm
 COPY . .
 
 WORKDIR /srv/build
-RUN cmake --preset ci-gcc ../rpm
+RUN cmake --preset ${CMAKE_PRESET} ../rpm
 RUN make -j$(nproc) tree
 
 RUN rm -rf /srv/{rpm,build}

tests/mktree.oci

@@ -88,7 +88,13 @@ case $CMD in
             $PODMAN commit -q $id --iidfile=$IID_FILE
         else
             # Standalone build
-            $PODMAN build --target full --iidfile=$IID_FILE $ARGS
+            opts=
+            case "$1" in
+                --preset)
+                    opts="--build-arg CMAKE_PRESET=ci-$2"
+                ;;
+            esac
+            $PODMAN build --target full --iidfile=$IID_FILE $opts $ARGS
         fi
     ;;
     check)