[Fuego] [PATCH 7/8] Functional.fontconfig: add libfreetype.6.13.0 expected out file
Qiu Tingting
qiutt at cn.fujitsu.com
Thu Aug 23 03:30:59 UTC 2018
Add expected out file of libfreetype.6.13.0 when checking the result in run-test.sh.
This modifications fix to support multi freetype version(6.13.0 & 6.12.3).
Signed-off-by: Qiu Tingting <qiutt at cn.fujitsu.com>
---
engine/tests/Functional.fontconfig/fuego_test.sh | 1 +
.../support_libfreetype-6-13-0.patch | 30 ++++++++++++++++++++++
2 files changed, 31 insertions(+)
create mode 100644 engine/tests/Functional.fontconfig/support_libfreetype-6-13-0.patch
diff --git a/engine/tests/Functional.fontconfig/fuego_test.sh b/engine/tests/Functional.fontconfig/fuego_test.sh
index a80d2e4..1c7d238 100755
--- a/engine/tests/Functional.fontconfig/fuego_test.sh
+++ b/engine/tests/Functional.fontconfig/fuego_test.sh
@@ -1,6 +1,7 @@
tarball=fontconfig-2.6.0.tar.gz
function test_build {
+ patch -p1 -N -s < $TEST_HOME/support_libfreetype-6-13-0.patch
sed -i -e "s/FCLIST=\.\.\/fc\-list\/fc\-list/FCLIST=\/usr\/bin\/fc\-list/g" -e "s/FCCACHE=\.\.\/fc\-cache\/fc\-cache/FCCACHE=\/usr\/bin\/fc\-cache/g" test/run-test.sh
}
diff --git a/engine/tests/Functional.fontconfig/support_libfreetype-6-13-0.patch b/engine/tests/Functional.fontconfig/support_libfreetype-6-13-0.patch
new file mode 100644
index 0000000..23b4d94
--- /dev/null
+++ b/engine/tests/Functional.fontconfig/support_libfreetype-6-13-0.patch
@@ -0,0 +1,30 @@
+diff -uNr old/test/out.expected-2 new/test/out.expected-2
+--- old/test/out.expected-2 1970-01-01 08:00:00.000000000 +0800
++++ new/test/out.expected-2 2018-08-03 14:55:42.108011895 +0800
+@@ -0,0 +1,8 @@
++Misc Fixed:pixelsize=6
++Sony Fixed:pixelsize=16
++=
++Misc Fixed:pixelsize=6
++Sony Fixed:pixelsize=16
++=
++Misc Fixed:pixelsize=6
++Sony Fixed:pixelsize=16
+diff -uNr old/test/run-test.sh new/test/run-test.sh
+--- old/test/run-test.sh 2018-08-03 14:49:20.636003490 +0800
++++ new/test/run-test.sh 2018-08-03 14:51:03.408005754 +0800
+@@ -20,9 +20,11 @@
+ $FCLIST - family pixelsize | sort >> out
+ tr -d '\015' <out >out.tmp; mv out.tmp out
+ if cmp out $TESTDIR/out.expected > /dev/null ; then : ; else
+- echo "*** Test failed: $TEST"
+- echo "*** output is in 'out', expected output in 'out.expected'"
+- exit 1
++ if cmp out $TESTDIR/out.expected-2 > /dev/null ; then : ; else
++ echo "*** Test failed: $TEST"
++ echo "*** output is in 'out', expected output in 'out.expected'"
++ exit 1
++ fi
+ fi
+ rm out
+ }
--
2.7.4
More information about the Fuego
mailing list