From 3c4e793442b70cbcdfdf0307f683d13543b3c5c1 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 12 Jul 2018 09:07:55 +1000
Subject: [PATCH] Gitlab CI: use a space in the meson builddir

Ideally this should catch any errors caused by reliance on unspaced
directories.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 .gitlab-ci.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d253b89..5a9b401 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,7 +45,7 @@ variables:
   UBUNTU_DEBS: 'git gcc g++     pkg-config         meson check       libudev-dev   libevdev-dev   doxygen graphviz valgrind binutils libwacom-dev   libcairo2-dev libgtk-3-dev libglib2.0-dev libmtdev-dev'
   ARCH_PKGS:   'git gcc         pkgconfig          meson check       libsystemd    libevdev       doxygen graphviz valgrind binutils libwacom                     gtk3                        mtdev      '
   ############################ end of package lists #############################
-  MESON_BUILDDIR: builddir
+  MESON_BUILDDIR: "build dir"
   NINJA_ARGS: 'test'
   MESON_ARGS: ''
   FEDORA_DOCKER_IMAGE: $CI_REGISTRY/libinput/$CI_PROJECT_NAME/fedora/$FEDORA_VERSION
@@ -69,10 +69,10 @@ variables:
 # The default build instructions
 .default_build: &default_build
   script:
-   - rm -rf $MESON_BUILDDIR
-   - meson $MESON_BUILDDIR $MESON_ARGS
-   - meson configure $MESON_BUILDDIR
-   - ninja -C $MESON_BUILDDIR $NINJA_ARGS
+   - rm -rf "$MESON_BUILDDIR"
+   - meson "$MESON_BUILDDIR" $MESON_ARGS
+   - meson configure "$MESON_BUILDDIR"
+   - ninja -C "$MESON_BUILDDIR" $NINJA_ARGS
 
 # special rule to not expose the docker creation runners to other users
 # than those who have set up the CI to push on the registry.
@@ -515,8 +515,8 @@ fedora:28@scan-build:
   before_script:
     - dnf install -y clang-analyzer findutils
   after_script:
-    - test ! -d $MESON_BUILDDIR/meson-logs/scanbuild && exit 0
-    - test $(find $MESON_BUILDDIR/meson-logs/scanbuild -maxdepth 0 ! -empty -exec echo "not empty" \; | wc -l) -eq 0 && exit 0
+    - test ! -d "$MESON_BUILDDIR"/meson-logs/scanbuild && exit 0
+    - test $(find "$MESON_BUILDDIR"/meson-logs/scanbuild -maxdepth 0 ! -empty -exec echo "not empty" \; | wc -l) -eq 0 && exit 0
     - echo "Check scan-build results"
     - /bin/false
 
@@ -593,9 +593,9 @@ fedora:28@valgrind:
   variables:
     FEDORA_VERSION: 28
   script:
-   - rm -rf $MESON_BUILDDIR
-   - meson $MESON_BUILDDIR $MESON_ARGS
-   - meson configure $MESON_BUILDDIR
+   - rm -rf "$MESON_BUILDDIR"
+   - meson "$MESON_BUILDDIR" $MESON_ARGS
+   - meson configure "$MESON_BUILDDIR"
    - meson test -C "$MESON_BUILDDIR" --setup=valgrind
 
 #
-- 
2.7.4