From 34791c32f19a3abc6a3dd2000d28202b80a882f9 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 26 Mar 2019 05:07:34 +0000 Subject: [PATCH] Don't share fonts and cache dir for testing There seems a race condition on CI. so create an unique directory to avoid colision. --- test/run-test.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/run-test.sh b/test/run-test.sh index 2bda9c2..aeb5ecd 100644 --- a/test/run-test.sh +++ b/test/run-test.sh @@ -28,8 +28,9 @@ esac TESTDIR=${srcdir-"$MyPWD"} BUILDTESTDIR=${builddir-"$MyPWD"} -FONTDIR="$MyPWD"/fonts -CACHEDIR="$MyPWD"/cache.dir +BASEDIR=`mktemp -d --tmpdir fontconfig.XXXXXXXX` +FONTDIR="$BASEDIR"/fonts +CACHEDIR="$BASEDIR"/cache.dir EXPECTED=${EXPECTED-"out.expected"} LOG_COMPILER=${LOG_COMPILER-"$TESTDIR/wrapper-script.sh"} @@ -226,6 +227,7 @@ dotest "sysroot option" prep mkdir -p $MyPWD/sysroot/$FONTDIR mkdir -p $MyPWD/sysroot/$CACHEDIR +mkdir -p $MyPWD/sysroot/$MyPWD cp $FONT1 $MyPWD/sysroot/$FONTDIR cp $MyPWD/fonts.conf $MyPWD/sysroot/$MyPWD/fonts.conf $FCCACHE -y $MyPWD/sysroot @@ -245,4 +247,4 @@ rm -rf $MyPWD/sysroot fi -rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out +rm -rf $FONTDIR $CACHEFILE $CACHEDIR $BASEDIR $FONTCONFIG_FILE out