From: Michal Koutný <mkoutny@suse.com>
Date: Tue, 21 Apr 2020 23:58:44 +0000 (+0200)
Subject: mkosi: Unify environment for unit tests
X-Git-Tag: v246-rc1~521^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff5499824f96a7e7b93ca0b294eec62ad21e6592;p=thirdparty%2Fsystemd.git

mkosi: Unify environment for unit tests

Some testcases in test-execute rely on existence of user groups with
certain gids. However, their existence is not universally granted [1].
Although the test could be skipped in their absence and give up testing
some code paths, different approach was chosen -- create dummy groups in
the testing image.

[1] See how systemd-sysusers allocates gids (e.g.
src/test/test-uid-range.c).
---

diff --git a/mkosi.build b/mkosi.build
index fc09baeadd0..4a13f1075eb 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -88,7 +88,13 @@ if [ ! -f "$BUILDDIR"/build.ninja ] ; then
 fi
 
 ninja -C "$BUILDDIR" all
-[ "$WITH_TESTS" = 0 ] || ninja -C "$BUILDDIR" test
+if [ "$WITH_TESTS" = 1 ] ; then
+        for id in 1 2 3; do
+                groupadd -g $id testgroup$id || :
+        done
+
+        ninja -C "$BUILDDIR" test
+fi
 ninja -C "$BUILDDIR" install
 
 mkdir -p "$DESTDIR"/etc