[Fontconfig] fontconfig: Branch 'master'

[GitLab Mirror]

 test/run-test.sh |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 8bddcb113779178e5b5ed711db08d9bfbff924cc
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Dec 5 19:55:06 2019 +0900

    Fix a test fail when no bwrap was available
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/201

diff --git a/test/run-test.sh b/test/run-test.sh
index e1ee6d0..9b2e54b 100644
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -40,9 +40,8 @@ ECHO=true
 FCLIST="$LOG_COMPILER ../fc-list/fc-list$EXEEXT"
 FCCACHE="$LOG_COMPILER ../fc-cache/fc-cache$EXEEXT"
 
-which bwrap > /dev/null 2>&1
-if [ $? -eq 0 ]; then
-    BWRAP=`which bwrap`
+if [ -x "$(command -v bwrap)" ]; then
+    BWRAP="$(command -v bwrap)"
 fi
 
 FONT1=$TESTDIR/4x6.pcf