walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix run-test.sh to work with BSD mktemp 

Avoid the GNU-specific --tmpdir flag to mkdir and always prefer to use
the directory specified in TMPDIR rather than /tmp.

See https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/288
This commit is contained in:
Ryan Schmidt 2021-07-08 17:29:16 -05:00 committed by Akira TAGOH
parent 6b67ab1c79
commit 8b3de9bd7f
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/run-test.sh
View File

@ -22,6 +22,8 @@
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
set -e set -e
: "${TMPDIR=/tmp}"
case "$OSTYPE" in case "$OSTYPE" in
msys ) MyPWD=$(pwd -W) ;; # On Msys/MinGW, returns a MS Windows style path. msys ) MyPWD=$(pwd -W) ;; # On Msys/MinGW, returns a MS Windows style path.
* ) MyPWD=$(pwd) ;; # On any other platforms, returns a Unix style path. * ) MyPWD=$(pwd) ;; # On any other platforms, returns a Unix style path.
@ -30,7 +32,7 @@ esac
TESTDIR=${srcdir-"$MyPWD"} TESTDIR=${srcdir-"$MyPWD"}
BUILDTESTDIR=${builddir-"$MyPWD"} BUILDTESTDIR=${builddir-"$MyPWD"}
BASEDIR=$(mktemp -d --tmpdir fontconfig.XXXXXXXX) BASEDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
FONTDIR="$BASEDIR"/fonts FONTDIR="$BASEDIR"/fonts
CACHEDIR="$BASEDIR"/cache.dir CACHEDIR="$BASEDIR"/cache.dir
EXPECTED=${EXPECTED-"out.expected"} EXPECTED=${EXPECTED-"out.expected"}
@ -174,7 +176,7 @@ fi
$FCCACHE "$FONTDIR" $FCCACHE "$FONTDIR"
sleep 1 sleep 1
ls -l "$CACHEDIR" > out1 ls -l "$CACHEDIR" > out1
TESTTMPDIR=$(mktemp -d /tmp/fontconfig.XXXXXXXX) TESTTMPDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
sed "s!@FONTDIR@!$TESTTMPDIR/fonts! sed "s!@FONTDIR@!$TESTTMPDIR/fonts!
s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>! s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>!
s!@CACHEDIR@!$TESTTMPDIR/cache.dir!" < "$TESTDIR"/fonts.conf.in > bind-fonts.conf s!@CACHEDIR@!$TESTTMPDIR/cache.dir!" < "$TESTDIR"/fonts.conf.in > bind-fonts.conf
@ -217,8 +219,8 @@ $FCCACHE "$FONTDIR"
sleep 1 sleep 1
ls -1 --color=no "$CACHEDIR"/*cache*> out1 ls -1 --color=no "$CACHEDIR"/*cache*> out1
stat -c '%n %s %y %z' "$(cat out1)" > stat1 stat -c '%n %s %y %z' "$(cat out1)" > stat1
TESTTMPDIR=$(mktemp -d /tmp/fontconfig.XXXXXXXX) TESTTMPDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
TESTTMP2DIR=$(mktemp -d /tmp/fontconfig.XXXXXXXX) TESTTMP2DIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
cp "$FONT2" "$TESTTMP2DIR" cp "$FONT2" "$TESTTMP2DIR"
if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$TESTTMP2DIR" touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$TESTTMP2DIR"
@ -269,7 +271,7 @@ fi
$FCCACHE "$FONTDIR" $FCCACHE "$FONTDIR"
sleep 1 sleep 1
(cd "$CACHEDIR"; ls -1 --color=no ./*cache*) > out1 (cd "$CACHEDIR"; ls -1 --color=no ./*cache*) > out1
TESTTMPDIR=$(mktemp -d /tmp/fontconfig.XXXXXXXX) TESTTMPDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
mkdir -p "$TESTTMPDIR"/cache.dir mkdir -p "$TESTTMPDIR"/cache.dir
sed "s!@FONTDIR@!$TESTTMPDIR/fonts! sed "s!@FONTDIR@!$TESTTMPDIR/fonts!
s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>! s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>!
@ -304,7 +306,7 @@ mv "$_cache" "$_newcache"
echo "$_uuid" > "$FONTDIR"/.uuid echo "$_uuid" > "$FONTDIR"/.uuid
touch -d @"$_mtime" "$FONTDIR" touch -d @"$_mtime" "$FONTDIR"
(cd "$CACHEDIR"; ls -1 --color=no ./*cache*) > out1 (cd "$CACHEDIR"; ls -1 --color=no ./*cache*) > out1
TESTTMPDIR=$(mktemp -d /tmp/fontconfig.XXXXXXXX) TESTTMPDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
mkdir -p "$TESTTMPDIR"/cache.dir mkdir -p "$TESTTMPDIR"/cache.dir
sed "s!@FONTDIR@!$TESTTMPDIR/fonts! sed "s!@FONTDIR@!$TESTTMPDIR/fonts!
s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>! s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>!
@ -357,10 +359,10 @@ cp "$FONT1" "$FONT2" "$FONTDIR"
if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR" touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"
fi fi
MYCACHEBASEDIR=$(mktemp -d /tmp/fontconfig.XXXXXXXX) MYCACHEBASEDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
MYCACHEDIR="$MYCACHEBASEDIR"/cache.dir MYCACHEDIR="$MYCACHEBASEDIR"/cache.dir
MYOWNCACHEDIR="$MYCACHEBASEDIR"/owncache.dir MYOWNCACHEDIR="$MYCACHEBASEDIR"/owncache.dir
MYCONFIG=$(mktemp /tmp/fontconfig.XXXXXXXX) MYCONFIG=$(mktemp "$TMPDIR"/fontconfig.XXXXXXXX)
mkdir -p "$MYCACHEDIR" mkdir -p "$MYCACHEDIR"
mkdir -p "$MYOWNCACHEDIR" mkdir -p "$MYOWNCACHEDIR"
@ -440,7 +442,7 @@ dotest "empty XDG_CACHE_HOME"
prep prep
export XDG_CACHE_HOME="" export XDG_CACHE_HOME=""
export old_HOME="$HOME" export old_HOME="$HOME"
export temp_HOME=$(mktemp -d --tmpdir fontconfig.XXXXXXXX) export temp_HOME=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
export HOME="$temp_HOME" export HOME="$temp_HOME"
cp "$FONT1" "$FONT2" "$FONTDIR" cp "$FONT1" "$FONT2" "$FONTDIR"
if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then