!15 fix test
From: @zhang-liang-pengkun Reviewed-by: @Charlie_li Signed-off-by: @Charlie_li
This commit is contained in:
openeuler-ci-bot
Gitee
commit
a09180e43e
172
fix-test.patch
Normal file
172
fix-test.patch
Normal file
@ -0,0 +1,172 @@
|
|||||||
|
From 299ae2fb0b829f3b5fa14ee27e72257180179470 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Martin Hosken <martin_hosken@sil.org>
|
||||||
|
Date: Fri, 17 Aug 2018 11:51:05 +0700
|
||||||
|
Subject: [PATCH] Fix tests
|
||||||
|
|
||||||
|
---
|
||||||
|
Tests/feaLib/data/multiple_feature_blocks.ttx | 2 +-
|
||||||
|
Tests/feaLib/data/spec4h1.fea | 17 ++++++-------
|
||||||
|
Tests/feaLib/data/spec4h1.ttx | 12 ++++-----
|
||||||
|
Tests/feaLib/data/spec4h2.fea | 4 +--
|
||||||
|
Tests/feaLib/data/spec4h2.ttx | 25 ++++++-------------
|
||||||
|
5 files changed, 23 insertions(+), 37 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Tests/feaLib/data/multiple_feature_blocks.ttx b/Tests/feaLib/data/multiple_feature_blocks.ttx
|
||||||
|
index 4f9a38960..73380c8ad 100644
|
||||||
|
--- a/Tests/feaLib/data/multiple_feature_blocks.ttx
|
||||||
|
+++ b/Tests/feaLib/data/multiple_feature_blocks.ttx
|
||||||
|
@@ -22,7 +22,7 @@
|
||||||
|
<DefaultLangSys>
|
||||||
|
<ReqFeatureIndex value="65535"/>
|
||||||
|
<!-- FeatureCount=1 -->
|
||||||
|
- <FeatureIndex index="0" value="1"/>
|
||||||
|
+ <FeatureIndex index="0" value="0"/>
|
||||||
|
</DefaultLangSys>
|
||||||
|
<!-- LangSysCount=1 -->
|
||||||
|
<LangSysRecord index="0">
|
||||||
|
diff --git a/Tests/feaLib/data/spec4h1.fea b/Tests/feaLib/data/spec4h1.fea
|
||||||
|
index b43e13b0d..3ea3b0ea4 100644
|
||||||
|
--- a/Tests/feaLib/data/spec4h1.fea
|
||||||
|
+++ b/Tests/feaLib/data/spec4h1.fea
|
||||||
|
@@ -33,8 +33,8 @@ feature liga {
|
||||||
|
sub c s by c_s;
|
||||||
|
|
||||||
|
# The rules above will be placed in a lookup that is registered
|
||||||
|
- # for all the specified languages for the script latn, but not any
|
||||||
|
- # other scripts.
|
||||||
|
+ # for only the dflt language for this script, and not any other
|
||||||
|
+ # languages.
|
||||||
|
|
||||||
|
language DEU;
|
||||||
|
# script latn; (stays the same)
|
||||||
|
@@ -43,16 +43,15 @@ feature liga {
|
||||||
|
sub c k by c_k;
|
||||||
|
|
||||||
|
# The rules above will be placed in a lookup that is registered
|
||||||
|
- # only under the script latn, language DEU.
|
||||||
|
+ # only under the script latn, language DEU, along with the lookup
|
||||||
|
+ # registered for the dflt language for this script.
|
||||||
|
|
||||||
|
language TRK;
|
||||||
|
|
||||||
|
- # This will inherit both the top level default rules - the rules
|
||||||
|
- # defined before the first 'script' statement, and the
|
||||||
|
- # script-level default rules for 'latn': all the lookups of this
|
||||||
|
- # feature defined after the 'script latn' statement, and before
|
||||||
|
- # the language DEU statement. If TRK were not named here, it
|
||||||
|
- # would not inherit the default rules for the script latn.
|
||||||
|
+ # This will inherit only the lookup defined for the dflt language
|
||||||
|
+ # for this script.
|
||||||
|
+ # If this statement were not here, the language would only inherit
|
||||||
|
+ # the lookup at the start of this feature before script latn.
|
||||||
|
} liga;
|
||||||
|
|
||||||
|
# TODO(sascha): Uncomment once we support 'pos' statements.
|
||||||
|
diff --git a/Tests/feaLib/data/spec4h1.ttx b/Tests/feaLib/data/spec4h1.ttx
|
||||||
|
index 0e42fc56e..4d3931cc9 100644
|
||||||
|
--- a/Tests/feaLib/data/spec4h1.ttx
|
||||||
|
+++ b/Tests/feaLib/data/spec4h1.ttx
|
||||||
|
@@ -65,18 +65,16 @@
|
||||||
|
<FeatureRecord index="0">
|
||||||
|
<FeatureTag value="liga"/>
|
||||||
|
<Feature>
|
||||||
|
- <!-- LookupCount=3 -->
|
||||||
|
- <LookupListIndex index="0" value="1"/>
|
||||||
|
- <LookupListIndex index="1" value="2"/>
|
||||||
|
- <LookupListIndex index="2" value="3"/>
|
||||||
|
+ <!-- LookupCount=2 -->
|
||||||
|
+ <LookupListIndex index="0" value="2"/>
|
||||||
|
+ <LookupListIndex index="1" value="3"/>
|
||||||
|
</Feature>
|
||||||
|
</FeatureRecord>
|
||||||
|
<FeatureRecord index="1">
|
||||||
|
<FeatureTag value="liga"/>
|
||||||
|
<Feature>
|
||||||
|
- <!-- LookupCount=2 -->
|
||||||
|
- <LookupListIndex index="0" value="1"/>
|
||||||
|
- <LookupListIndex index="1" value="2"/>
|
||||||
|
+ <!-- LookupCount=1 -->
|
||||||
|
+ <LookupListIndex index="0" value="2"/>
|
||||||
|
</Feature>
|
||||||
|
</FeatureRecord>
|
||||||
|
<FeatureRecord index="2">
|
||||||
|
diff --git a/Tests/feaLib/data/spec4h2.fea b/Tests/feaLib/data/spec4h2.fea
|
||||||
|
index 038480486..e90999899 100644
|
||||||
|
--- a/Tests/feaLib/data/spec4h2.fea
|
||||||
|
+++ b/Tests/feaLib/data/spec4h2.fea
|
||||||
|
@@ -9,7 +9,7 @@ languagesystem cyrl SRB;
|
||||||
|
languagesystem grek dflt;
|
||||||
|
|
||||||
|
feature liga {
|
||||||
|
- # start of default rules that are applied under all language systems.
|
||||||
|
+ # start of default rules that are applied to unspecified languages below
|
||||||
|
lookup HAS_I {
|
||||||
|
sub f f i by f_f_i;
|
||||||
|
sub f i by f_i;
|
||||||
|
@@ -20,7 +20,7 @@ feature liga {
|
||||||
|
sub f f by f_f;
|
||||||
|
} NO_I;
|
||||||
|
|
||||||
|
- # end of default rules that are applied under all language systems.
|
||||||
|
+ # end of default rules that are applied to unspecified languages below
|
||||||
|
|
||||||
|
script latn;
|
||||||
|
language dflt;
|
||||||
|
diff --git a/Tests/feaLib/data/spec4h2.ttx b/Tests/feaLib/data/spec4h2.ttx
|
||||||
|
index 266c4870d..8005c2f69 100644
|
||||||
|
--- a/Tests/feaLib/data/spec4h2.ttx
|
||||||
|
+++ b/Tests/feaLib/data/spec4h2.ttx
|
||||||
|
@@ -19,11 +19,6 @@
|
||||||
|
<ScriptRecord index="1">
|
||||||
|
<ScriptTag value="cyrl"/>
|
||||||
|
<Script>
|
||||||
|
- <DefaultLangSys>
|
||||||
|
- <ReqFeatureIndex value="65535"/>
|
||||||
|
- <!-- FeatureCount=1 -->
|
||||||
|
- <FeatureIndex index="0" value="3"/>
|
||||||
|
- </DefaultLangSys>
|
||||||
|
<!-- LangSysCount=1 -->
|
||||||
|
<LangSysRecord index="0">
|
||||||
|
<LangSysTag value="SRB "/>
|
||||||
|
@@ -79,20 +74,16 @@
|
||||||
|
<FeatureRecord index="0">
|
||||||
|
<FeatureTag value="liga"/>
|
||||||
|
<Feature>
|
||||||
|
- <!-- LookupCount=4 -->
|
||||||
|
- <LookupListIndex index="0" value="0"/>
|
||||||
|
- <LookupListIndex index="1" value="1"/>
|
||||||
|
- <LookupListIndex index="2" value="2"/>
|
||||||
|
- <LookupListIndex index="3" value="3"/>
|
||||||
|
+ <!-- LookupCount=2 -->
|
||||||
|
+ <LookupListIndex index="0" value="2"/>
|
||||||
|
+ <LookupListIndex index="1" value="3"/>
|
||||||
|
</Feature>
|
||||||
|
</FeatureRecord>
|
||||||
|
<FeatureRecord index="1">
|
||||||
|
<FeatureTag value="liga"/>
|
||||||
|
<Feature>
|
||||||
|
- <!-- LookupCount=3 -->
|
||||||
|
- <LookupListIndex index="0" value="0"/>
|
||||||
|
- <LookupListIndex index="1" value="1"/>
|
||||||
|
- <LookupListIndex index="2" value="4"/>
|
||||||
|
+ <!-- LookupCount=1 -->
|
||||||
|
+ <LookupListIndex index="0" value="4"/>
|
||||||
|
</Feature>
|
||||||
|
</FeatureRecord>
|
||||||
|
<FeatureRecord index="2">
|
||||||
|
@@ -113,10 +104,8 @@
|
||||||
|
<FeatureRecord index="4">
|
||||||
|
<FeatureTag value="liga"/>
|
||||||
|
<Feature>
|
||||||
|
- <!-- LookupCount=3 -->
|
||||||
|
- <LookupListIndex index="0" value="0"/>
|
||||||
|
- <LookupListIndex index="1" value="1"/>
|
||||||
|
- <LookupListIndex index="2" value="2"/>
|
||||||
|
+ <!-- LookupCount=1 -->
|
||||||
|
+ <LookupListIndex index="0" value="2"/>
|
||||||
|
</Feature>
|
||||||
|
</FeatureRecord>
|
||||||
|
</FeatureList>
|
||||||
|
--
|
||||||
|
2.39.0.windows.2
|
||||||
|
|
||||||
@ -1,12 +1,14 @@
|
|||||||
Name: fonttools
|
Name: fonttools
|
||||||
Version: 3.29.0
|
Version: 3.29.0
|
||||||
Release: 5
|
Release: 6
|
||||||
Summary: Tools to manipulate font files
|
Summary: Tools to manipulate font files
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://github.com/fonttools/fonttools/
|
URL: https://github.com/fonttools/fonttools/
|
||||||
Source0: %{url}/releases/download/%{version}/fonttools-%{version}.zip
|
Source0: %{url}/releases/download/%{version}/fonttools-%{version}.zip
|
||||||
Patch01: replace-fromtring-with-frombytes.patch
|
Patch01: replace-fromtring-with-frombytes.patch
|
||||||
Patch02: replace-totring-with-tobytes.patch
|
Patch02: replace-totring-with-tobytes.patch
|
||||||
|
Patch03: fix-test.patch
|
||||||
|
|
||||||
Requires: python3-fonttools
|
Requires: python3-fonttools
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Provides: ttx = %{version}-%{release}
|
Provides: ttx = %{version}-%{release}
|
||||||
@ -64,6 +66,9 @@ rm -rf *.egg-info
|
|||||||
%{python3_sitelib}/fonttools-%{version}-py3.?.egg-info
|
%{python3_sitelib}/fonttools-%{version}-py3.?.egg-info
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 9 2023 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 3.29.0-6
|
||||||
|
- fix test
|
||||||
|
|
||||||
* Tue Jan 11 2022 houyingchao <houyingchao@huawei.com> - 3.29.0-5
|
* Tue Jan 11 2022 houyingchao <houyingchao@huawei.com> - 3.29.0-5
|
||||||
- Replace totring with tobytes
|
- Replace totring with tobytes
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user