From d54c7ecbd618afb4df524e0d96dec7fe7cc2935d Mon Sep 17 00:00:00 2001
From: Cam Cope <github@camcope.me>
Date: Mon, 30 Aug 2021 07:35:33 -0700
Subject: Fixup whitespace and configure CI to keep it that way

---
 test/travis-build.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'test/travis-build.sh')

diff --git a/test/travis-build.sh b/test/travis-build.sh
index c33f7dc..aa72cb2 100755
--- a/test/travis-build.sh
+++ b/test/travis-build.sh
@@ -6,36 +6,40 @@ set -e
 # that we still need to fix
 export ASAN_OPTIONS="detect_leaks=0"
 
-export LSAN_OPTIONS="suppressions=$(pwd)/test/lsan_suppress.txt"
+export LSAN_OPTIONS="suppressions=${PWD}/test/lsan_suppress.txt"
 export CC
 
 TEST_CMD="python3 -m pytest --maxfail=99 test/"
 
 # Standard build with Valgrind
 for CC in gcc clang; do
+    (
     mkdir "build-${CC}"; cd "build-${CC}"
     if [ "${CC}" == 'gcc-6' ]; then
         build_opts='-D b_lundef=false'
     else
         build_opts=''
     fi
+    # shellcheck disable=SC2086
     meson -D werror=true ${build_opts} ../
     ninja
 
     TEST_WITH_VALGRIND=true ${TEST_CMD}
-    cd ..
+    )
 done
 (cd "build-${CC}"; sudo ninja install)
 
 # Sanitized build
 CC=clang
 for san in undefined address; do
-    mkdir "build-${san}"; cd "build-${san}"
+    (
+    mkdir "build-${san}"
+    cd "build-${san}"
     # b_lundef=false is required to work around clang
     # bug, cf. https://groups.google.com/forum/#!topic/mesonbuild/tgEdAXIIdC4
     meson -D b_sanitize=${san} -D b_lundef=false -D werror=true ..
     ninja
     ${TEST_CMD}
     sudo ninja install
-    cd ..
+    )
 done
-- 
cgit v1.2.3