[graphite2] 02/06: Enable the fnttxtreader tests again

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository graphite2.

commit 1119d214e693694adeb01b22603dadfdc7240259
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Thu Sep 28 16:46:26 2017 +0200

    Enable the fnttxtreader tests again
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/patches/series                                   |  3 +--
 .../patches/temporarily-disable-fnttxtrender-tests.diff | 17 -----------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index c92835d..e171cf4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,4 @@ non-linux.diff
 no-icons.diff
 test-timeout.diff
 reproducible-build.diff
-#testsuite-python3.diff
-temporarily-disable-fnttxtrender-tests.diff
+testsuite-python3.diff
diff --git a/debian/patches/temporarily-disable-fnttxtrender-tests.diff b/debian/patches/temporarily-disable-fnttxtrender-tests.diff
deleted file mode 100644
index 72c99ab..0000000
--- a/debian/patches/temporarily-disable-fnttxtrender-tests.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- graphite2-1.3.10.orig/Graphite.cmake
-+++ graphite2-1.3.10/Graphite.cmake
-@@ -112,14 +112,6 @@ function(cmptest TESTNAME FONTFILE TEXTF
-     if (EXISTS ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${CMAKE_SYSTEM_NAME}.json)
-         set(PLATFORM_TEST_SUFFIX ${CMAKE_SYSTEM_NAME})
-     endif (EXISTS ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${CMAKE_SYSTEM_NAME}.json)
--    if ((NOT GRAPHITE2_NFILEFACE) AND ((NOT GRAPHITE2_ASAN) OR CMAKE_COMPILER_IS_GNUCXX))
--        add_test(NAME ${TESTNAME} COMMAND python ${PROJECT_SOURCE_DIR}/fnttxtrender --graphite_library=$<TARGET_FILE:graphite2> -t ${PROJECT_SOURCE_DIR}/texts/${TEXTFILE} -o ${PROJECT_BINARY_DIR}/${TESTNAME}.json -c ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${PLATFORM_TEST_SUFFIX}.json ${ARGN} ${PROJECT_SOURCE_DIR}/fonts/${FONTFILE})
--        if (GRAPHITE2_ASAN)
--            set_property(TEST ${TESTNAME} APPEND 
--                    PROPERTY ENVIRONMENT "ASAN_SYMBOLIZER_PATH=${ASAN_SYMBOLIZER}"
--                                         "LD_PRELOAD=libasan.so.1")
--        endif (GRAPHITE2_ASAN)
--    endif ((NOT GRAPHITE2_NFILEFACE) AND ((NOT GRAPHITE2_ASAN) OR CMAKE_COMPILER_IS_GNUCXX))
- endfunction(cmptest)
- 
- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git