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

Fix distcheck fail

This commit is contained in:
Akira TAGOH 2018-08-29 10:01:45 +00:00
parent 0ce32973c8
commit a887659706
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/Makefile.am
View File

@ -93,6 +93,6 @@ TESTS += test-bz106632
EXTRA_DIST=run-test.sh run-test-conf.sh $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names EXTRA_DIST=run-test.sh run-test-conf.sh $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names
CLEANFILES=out fonts.conf out.expected CLEANFILES=out out1 out2 fonts.conf out.expected
-include $(top_srcdir)/git.mk -include $(top_srcdir)/git.mk

6
test/run-test.sh
View File

@ -57,7 +57,7 @@ check () {
echo "*** output is in 'out', expected output in '$EXPECTED'" echo "*** output is in 'out', expected output in '$EXPECTED'"
exit 1 exit 1
fi fi
rm out rm -f out
} }
prep() { prep() {
@ -141,7 +141,7 @@ if cmp out1 out2 > /dev/null ; then
echo "*** .uuid wasn't modified" echo "*** .uuid wasn't modified"
exit 1 exit 1
fi fi
rm out1 out2 rm -f out1 out2
dotest "Consistency between .uuid and cache name" dotest "Consistency between .uuid and cache name"
prep prep
@ -244,7 +244,7 @@ prep
cp $FONT1 $FONT2 $FONTDIR cp $FONT1 $FONT2 $FONTDIR
$FCCACHE $FONTDIR $FCCACHE $FONTDIR
sleep 1 sleep 1
rm $FONTDIR/*pcf rm -f $FONTDIR/*pcf
$FCCACHE $FONTDIR $FCCACHE $FONTDIR
rmdir $FONTDIR > /dev/null 2>&1 rmdir $FONTDIR > /dev/null 2>&1
if [ $? != 0 ]; then if [ $? != 0 ]; then

2
test/test-bz106632.c
View File

@ -226,7 +226,7 @@ main (void)
goto bail; goto bail;
} }
fprintf (stderr, "D: Removing %s\n", fontdir); fprintf (stderr, "D: Removing %s\n", fontdir);
snprintf (cmd, 512, "rm %s%s*", fontdir, FC_DIR_SEPARATOR_S); snprintf (cmd, 512, "rm -f %s%s*", fontdir, FC_DIR_SEPARATOR_S);
system (cmd); system (cmd);
fprintf (stderr, "D: Reinitializing\n"); fprintf (stderr, "D: Reinitializing\n");
if (!FcConfigUptoDate (config) || !FcInitReinitialize ()) if (!FcConfigUptoDate (config) || !FcInitReinitialize ())