diff options
| author | Akira TAGOH <akira@tagoh.org> | 2022-09-28 23:30:06 +0900 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2022-09-28 23:30:06 +0900 |
| commit | a10d07682a09ce5effbd121920b119618f4b7775 (patch) | |
| tree | 267e5b9bdaeac952a1527e3753b00d4f83103e77 | |
| parent | fc0e9a78d2fe3b26f0b93c2a99b160e75e2a9f89 (diff) | |
| download | fontconfig-a10d07682a09ce5effbd121920b119618f4b7775.tar.gz | |
Fix test cases for wrong use of remap-dir
| -rw-r--r-- | test/run-test.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/test/run-test.sh b/test/run-test.sh index 1cedb8d..2b8a412 100644 --- a/test/run-test.sh +++ b/test/run-test.sh @@ -177,11 +177,14 @@ $FCCACHE "$FONTDIR" sleep 1 ls -l "$CACHEDIR" > out1 TESTTMPDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX) -sed "s!@FONTDIR@!$TESTTMPDIR/fonts! +# Once font dir is remapped, we could use $FONTDIR as different one in theory. +# but we don't use it here and to avoid duplicate entries, set the non-existing +# directory here. +sed "s!@FONTDIR@!$FONTDIR/a! s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>! s!@CACHEDIR@!$TESTTMPDIR/cache.dir!" < "$TESTDIR"/fonts.conf.in > bind-fonts.conf $BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/fc-match/fc-match"$EXEEXT" -f "%{file}\n" ":foundry=Misc" > xxx -$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/test/test-bz106618"$EXEEXT" | sort > flist1 +$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/test/test-bz106618"$EXEEXT" > flist1 $BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev find "$TESTTMPDIR"/fonts/ -type f -name '*.pcf' | sort > flist2 ls -l "$CACHEDIR" > out2 if cmp out1 out2 > /dev/null ; then : ; else @@ -273,7 +276,10 @@ sleep 1 (cd "$CACHEDIR"; ls -1 --color=no ./*cache*) > out1 TESTTMPDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX) mkdir -p "$TESTTMPDIR"/cache.dir -sed "s!@FONTDIR@!$TESTTMPDIR/fonts! +# Once font dir is remapped, we could use $FONTDIR as different one in theory. +# but we don't use it here and to avoid duplicate entries, set the non-existing +# directory here. +sed "s!@FONTDIR@!$FONTDIR/a! s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>! s!@CACHEDIR@!$TESTTMPDIR/cache.dir!" < "$TESTDIR"/fonts.conf.in > bind-fonts.conf $BWRAP --bind / / --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/fc-cache/fc-cache"$EXEEXT" "$TESTTMPDIR"/fonts |