diff options
| author | Martin Pitt <martinpitt@users.noreply.github.com> | 2017-07-20 15:10:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-20 15:10:49 +0200 |
| commit | 39bd1fdf7a3dc21ee4be6effa864b6f734c3010e (patch) | |
| tree | aad6262056e7289b2c876804f3a4aecd181fa6ec | |
| parent | f1e52909c8cc59ec9a13af071972bf9322179e2e (diff) | |
| parent | 9400405b4a8ef5f5e32f4b01f0a89ad3c17f3393 (diff) | |
| download | systemd-39bd1fdf7a3dc21ee4be6effa864b6f734c3010e.tar.gz | |
Merge pull request #6386 from poettering/mkosi-without-tests
mkosi: support mkosi's --without-tests switch
| -rwxr-xr-x | mkosi.build | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mkosi.build b/mkosi.build index a36460c6f5..12e88b909c 100755 --- a/mkosi.build +++ b/mkosi.build @@ -25,9 +25,10 @@ [ -z "$BUILDDIR" ] && BUILDDIR=build export LC_CTYPE=C.UTF-8 -test -f "$BUILDDIR"/build.ninja || meson "$BUILDDIR" + +[ -f "$BUILDDIR"/build.ninja ] || meson "$BUILDDIR" ninja -C "$BUILDDIR" all -ninja -C "$BUILDDIR" test +[ "$WITH_TESTS" = 0 ] || ninja -C "$BUILDDIR" test ninja -C "$BUILDDIR" install mkdir -p "$DESTDIR"/etc |