Merge pull request #6386 from poettering/mkosi-without-tests

mkosi: support mkosi's --without-tests switch
2017-07-20 15:10:49 +02:00
parent f1e52909c8 9400405b4a
commit 39bd1fdf7a
1 changed files with 3 additions and 2 deletions
@@ -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