test/Makefile.am | 2 +-
test/run-test.sh | 6 +++---
test/test-bz106632.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit a887659706ff5bce6e4ef570dc8447ae75cc9534
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Wed Aug 29 10:01:45 2018 +0000
Fix distcheck fail
diff --git a/test/Makefile.am b/test/Makefile.am
index f9f043c..79bcede 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -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
-CLEANFILES=out fonts.conf out.expected
+CLEANFILES=out out1 out2 fonts.conf out.expected
-include $(top_srcdir)/git.mk
diff --git a/test/run-test.sh b/test/run-test.sh
index e932601..e76e39b 100644
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -57,7 +57,7 @@ check () {
echo "*** output is in 'out', expected output in '$EXPECTED'"
exit 1
fi
- rm out
+ rm -f out
}
prep() {
@@ -141,7 +141,7 @@ if cmp out1 out2 > /dev/null ; then
echo "*** .uuid wasn't modified"
exit 1
fi
-rm out1 out2
+rm -f out1 out2
dotest "Consistency between .uuid and cache name"
prep
@@ -244,7 +244,7 @@ prep
cp $FONT1 $FONT2 $FONTDIR
$FCCACHE $FONTDIR
sleep 1
-rm $FONTDIR/*pcf
+rm -f $FONTDIR/*pcf
$FCCACHE $FONTDIR
rmdir $FONTDIR > /dev/null 2>&1
if [ $? != 0 ]; then
diff --git a/test/test-bz106632.c b/test/test-bz106632.c
index 0736b97..daa0c1e 100644
--- a/test/test-bz106632.c
+++ b/test/test-bz106632.c
@@ -226,7 +226,7 @@ main (void)
goto bail;
}
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);
fprintf (stderr, "D: Reinitializing\n");
if (!FcConfigUptoDate (config) || !FcInitReinitialize ())
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/fontconfig
