[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - test/Makefile.am

Jan Holesovsky kendy at collabora.com
Wed Apr 5 13:45:45 UTC 2017


 test/Makefile.am |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit bdac5059dc0d7d8b6b7f8123ac1555598c9eaaa7
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Apr 5 15:44:44 2017 +0200

    Run fc-cache before running the unit tests too.
    
    Change-Id: I5d0cc0a1299cfdf1dc0e421d5fab8e2705a258ff

diff --git a/test/Makefile.am b/test/Makefile.am
index 2935e6a0..754f0f12 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -69,6 +69,7 @@ endif
 
 if HAVE_LO_PATH
 check-local:
+	@fc-cache "@LO_PATH@"/share/fonts/truetype
 	./run_unit.sh --log-file test.log --trs-file test.trs
 # FIXME 2: unit-oob.la fails with symbol undefined:
 # UnitWSD::testHandleRequest(UnitWSD::TestRequest, UnitHTTPServerRequest&, UnitHTTPServerResponse&) ,
@@ -83,6 +84,7 @@ LA_LOG_DRIVER = ${top_srcdir}/test/run_unit.sh
 EXTRA_DIST = data/hello.odt data/hello.txt $(test_SOURCES) $(unittest_SOURCES) run_unit.sh
 
 check_valgrind: all
+	@fc-cache "@LO_PATH@"/share/fonts/truetype
 	./run_unit.sh --log-file test.log --trs-file test.trs --valgrind
 
 # run unittest during the normal build
@@ -90,4 +92,5 @@ all-local: unittest
 	@echo
 	@echo "Running build-time unit tests.  For more thorough testing, please run 'make check'."
 	@echo
+	@fc-cache "@LO_PATH@"/share/fonts/truetype
 	@${top_builddir}/test/unittest 2> unittest.log || { cat unittest.log ; exit 1 ; }


More information about the Libreoffice-commits mailing list