Commit 34791c32 authored by Akira TAGOH's avatar Akira TAGOH
Browse files

Don't share fonts and cache dir for testing

There seems a race condition on CI. so create an unique directory to avoid colision.
parent 0950f248
...@@ -28,8 +28,9 @@ esac ...@@ -28,8 +28,9 @@ esac
TESTDIR=${srcdir-"$MyPWD"} TESTDIR=${srcdir-"$MyPWD"}
BUILDTESTDIR=${builddir-"$MyPWD"} BUILDTESTDIR=${builddir-"$MyPWD"}
FONTDIR="$MyPWD"/fonts BASEDIR=`mktemp -d --tmpdir fontconfig.XXXXXXXX`
CACHEDIR="$MyPWD"/cache.dir FONTDIR="$BASEDIR"/fonts
CACHEDIR="$BASEDIR"/cache.dir
EXPECTED=${EXPECTED-"out.expected"} EXPECTED=${EXPECTED-"out.expected"}
LOG_COMPILER=${LOG_COMPILER-"$TESTDIR/wrapper-script.sh"} LOG_COMPILER=${LOG_COMPILER-"$TESTDIR/wrapper-script.sh"}
...@@ -226,6 +227,7 @@ dotest "sysroot option" ...@@ -226,6 +227,7 @@ dotest "sysroot option"
prep prep
mkdir -p $MyPWD/sysroot/$FONTDIR mkdir -p $MyPWD/sysroot/$FONTDIR
mkdir -p $MyPWD/sysroot/$CACHEDIR mkdir -p $MyPWD/sysroot/$CACHEDIR
mkdir -p $MyPWD/sysroot/$MyPWD
cp $FONT1 $MyPWD/sysroot/$FONTDIR cp $FONT1 $MyPWD/sysroot/$FONTDIR
cp $MyPWD/fonts.conf $MyPWD/sysroot/$MyPWD/fonts.conf cp $MyPWD/fonts.conf $MyPWD/sysroot/$MyPWD/fonts.conf
$FCCACHE -y $MyPWD/sysroot $FCCACHE -y $MyPWD/sysroot
...@@ -245,4 +247,4 @@ rm -rf $MyPWD/sysroot ...@@ -245,4 +247,4 @@ rm -rf $MyPWD/sysroot
fi fi
rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out rm -rf $FONTDIR $CACHEFILE $CACHEDIR $BASEDIR $FONTCONFIG_FILE out
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment