From d3be110ffc127c3efc7787d28acc1a5db2a1add1 Mon Sep 17 00:00:00 2001
From: Nexarian <cmp@pitstick.net>
Date: Sat, 11 Feb 2023 00:28:30 -0500
Subject: [PATCH] Add unit test parameter for more coverage.

---
 .github/workflows/build.yml                   | 28 ++++++++++++++++---
 ...nstall_xrdp_build_dependencies_with_apt.sh |  5 +++-
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b757e4c4..a7b17bc9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,34 +21,43 @@ jobs:
             feature_set: min
             arch: amd64
             os: ubuntu-latest
+            unittests: false
+            DISTCHECK: false
 
           - CC: g++
             feature_set: min
             arch: amd64
             os: ubuntu-latest
+            unittests: false
+            DISTCHECK: false
 
           - CC: clang
             feature_set: min
             arch: amd64
             os: ubuntu-latest
+            unittests: false
+            DISTCHECK: false
 
           # Maximal 64-bit arch builds
           - CC: gcc
             feature_set: max
             arch: amd64
             os: ubuntu-latest
+            unittests: true
             DISTCHECK: true
 
           - CC: g++
             feature_set: max
             arch: amd64
             os: ubuntu-latest
-            DISTCHECK: true
+            unittests: false
+            DISTCHECK: false
 
           - CC: clang
             feature_set: max
             arch: amd64
             os: ubuntu-latest
+            unittests: true
             DISTCHECK: true
 
           # Maximal debug 64-bit arch builds
@@ -58,6 +67,8 @@ jobs:
             feature_set: max
             arch: amd64
             os: ubuntu-latest
+            unittests: true
+            DISTCHECK: false
             name_extra: and DEBUG
             CONF_FLAGS_EXTRA: "--enable-devel-all --disable-static"
 
@@ -65,19 +76,25 @@ jobs:
           - CC: gcc
             feature_set: max
             arch: i386
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            unittests: true
+            DISTCHECK: false
             name_extra: for 32-bit arch (legacy OS)
 
           - CC: g++
             feature_set: max
             arch: i386
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            unittests: false
+            DISTCHECK: false
             name_extra: for 32-bit arch (legacy OS)
 
           - CC: clang
             feature_set: max
             arch: i386
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            unittests: true
+            DISTCHECK: false
             name_extra: for 32-bit arch (legacy OS)
 
     name: ${{ matrix.feature_set }} features with ${{ matrix.CC }} ${{ matrix.name_extra }}
@@ -124,6 +141,9 @@ jobs:
         run: ./configure $CONF_FLAGS
       - name: make
         run: make -j $(nproc)
+      - name: unittests
+        if: ${{ matrix.unittests }}
+        run: make check -j $(nproc)
       - name: distcheck
         id: dist_check
         if: ${{ matrix.DISTCHECK }}
diff --git a/scripts/install_xrdp_build_dependencies_with_apt.sh b/scripts/install_xrdp_build_dependencies_with_apt.sh
index 5c70a6b5..cc851167 100755
--- a/scripts/install_xrdp_build_dependencies_with_apt.sh
+++ b/scripts/install_xrdp_build_dependencies_with_apt.sh
@@ -125,7 +125,10 @@ in
             libxext-dev:i386 \
             libxfixes-dev:i386 \
             libxrandr-dev:i386 \
-            libxrender-dev:i386"
+            libxrender-dev:i386 \
+            libsubunit-dev:i386 \
+            check:i386 \
+            libcmocka-dev:i386"
 
         dpkg --add-architecture i386
         dpkg --print-architecture