This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository graphite2.
commit e043c0da8a18c17b49d601a43fb97ca3dccc92f1 Author: Rene Engelhard <[email protected]> Date: Wed Aug 12 17:12:57 2015 +0200 Imported Debian patch 1.3.0-2 --- debian/changelog | 8 ++++++++ debian/patches/cfab7499b46b | 29 +++++++++++++++++++++++++++++ debian/patches/non-linux.diff | 29 +++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/patches/test-timeout.diff | 11 +++++++++++ 5 files changed, 78 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5f32077..02868d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +graphite2 (1.3.0-2) experimental; urgency=medium + + * backport fixes from http://hg.palaso.org/graphitedev/raw-rev/cfab7499b46b: + - fix tests on !linux (closes: #79499) + - increase test timeout from 10s to 120s to make them succeed on mips(el) + + -- Rene Engelhard <[email protected]> Wed, 12 Aug 2015 17:12:57 +0200 + graphite2 (1.3.0-1) experimental; urgency=medium * New upstream release diff --git a/debian/patches/cfab7499b46b b/debian/patches/cfab7499b46b new file mode 100644 index 0000000..7122bc5 --- /dev/null +++ b/debian/patches/cfab7499b46b @@ -0,0 +1,29 @@ + +# HG changeset patch +# User Martin Hosken <[email protected]> +# Date 1439048141 -25200 +# Node ID cfab7499b46b2b47e37e1fd0c9ab36e3426fdea4 +# Parent e6539b6769cf98b2e36769999c2388d8427201d3 +Enable testing in more environments + +diff -r e6539b6769cf -r cfab7499b46b tests/graphite.py +--- a/tests/graphite.py Wed Aug 05 09:00:12 2015 +0700 ++++ b/tests/graphite.py Sat Aug 08 22:35:41 2015 +0700 +@@ -34,13 +34,14 @@ + 'darwin' : 'libgraphite2.dylib', + 'linux2' : 'libgraphite2.so', + 'win32' : 'graphite2.dll', +- 'win64' : 'graphite2-x64.dll' ++ 'win64' : 'graphite2-x64.dll', ++ 'gnukfreebsd9' : 'libgraphite2.so' + } + gr2 = None + if sys.platform == 'win32' and sys.maxsize > (1 << 32) : + grfile = grfiles['win64'] + else : +- grfile = grfiles[sys.platform] ++ grfile = grfiles.get(sys.platform, grfiles['linux2']) + for b in (os.path.join(b,'src',c) for b in basedirs for c in ('', 'Debug', 'Release', 'DebWithRelInfo', 'MinSizeRel')): + testfile = os.path.join(b, grfile) + print "Trying " + testfile + diff --git a/debian/patches/non-linux.diff b/debian/patches/non-linux.diff index 62b4725..5f80018 100644 --- a/debian/patches/non-linux.diff +++ b/debian/patches/non-linux.diff @@ -71,3 +71,32 @@ add_test(vm-test-call-threading vm-test-call ${testing_SOURCE_DIR}/fonts/tiny.ttf 1) set_tests_properties(vm-test-call-threading PROPERTIES + +# HG changeset patch +# User Martin Hosken <[email protected]> +# Date 1439048141 -25200 +# Node ID cfab7499b46b2b47e37e1fd0c9ab36e3426fdea4 +# Parent e6539b6769cf98b2e36769999c2388d8427201d3 +Enable testing in more environments + +diff -r e6539b6769cf -r cfab7499b46b tests/graphite.py +--- a/tests/graphite.py Wed Aug 05 09:00:12 2015 +0700 ++++ b/tests/graphite.py Sat Aug 08 22:35:41 2015 +0700 +@@ -34,13 +34,14 @@ + 'darwin' : 'libgraphite2.dylib', + 'linux2' : 'libgraphite2.so', + 'win32' : 'graphite2.dll', +- 'win64' : 'graphite2-x64.dll' ++ 'win64' : 'graphite2-x64.dll', ++ 'gnukfreebsd9' : 'libgraphite2.so' + } + gr2 = None + if sys.platform == 'win32' and sys.maxsize > (1 << 32) : + grfile = grfiles['win64'] + else : +- grfile = grfiles[sys.platform] ++ grfile = grfiles.get(sys.platform, grfiles['linux2']) + for b in (os.path.join(b,'src',c) for b in basedirs for c in ('', 'Debug', 'Release', 'DebWithRelInfo', 'MinSizeRel')): + testfile = os.path.join(b, grfile) + print "Trying " + testfile + diff --git a/debian/patches/series b/debian/patches/series index 97d0d42..d39cfd6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ non-linux.diff no-icons.diff +test-timeout.diff diff --git a/debian/patches/test-timeout.diff b/debian/patches/test-timeout.diff new file mode 100644 index 0000000..90fcc38 --- /dev/null +++ b/debian/patches/test-timeout.diff @@ -0,0 +1,11 @@ +--- graphite2-1.3.0.orig/Graphite.cmake ++++ graphite2-1.3.0/Graphite.cmake +@@ -111,7 +111,7 @@ function(cmptest TESTNAME FONTFILE TEXTF + endif (EXISTS ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${CMAKE_SYSTEM_NAME}.json) + if (NOT (GRAPHITE2_NFILEFACE)) + add_test(NAME ${TESTNAME} COMMAND python ${PROJECT_SOURCE_DIR}/fnttxtrender -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}) +- set_tests_properties(${TESTNAME} PROPERTIES TIMEOUT 10) ++ set_tests_properties(${TESTNAME} PROPERTIES TIMEOUT 120) + endif (NOT (GRAPHITE2_NFILEFACE)) + endfunction(cmptest) + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git
