From 89d332559ee4d5349315b35e64b34c27116ba441 Mon Sep 17 00:00:00 2001
From: Qunxin Liu <qxliu@google.com>
Date: Fri, 20 Jan 2023 14:15:19 -0800
Subject: [PATCH] [instancer] add tests

---
 ....retain-all-codepoint.wght=150,wdth=80.ttf | Bin 114200 -> 114200 bytes
 ....retain-all-codepoint.wght=300,wdth=90.ttf | Bin 114300 -> 114300 bytes
 ....retain-all-codepoint.wght=150,wdth=80.ttf | Bin 114200 -> 114200 bytes
 ....retain-all-codepoint.wght=300,wdth=90.ttf | Bin 114300 -> 114300 bytes
 .../MPLUS1-Variable.default.30DD.wght=100.ttf | Bin 1460 -> 1460 bytes
 .../MPLUS1-Variable.default.30DD.wght=400.ttf | Bin 1712 -> 1712 bytes
 ....retain-all-codepoint.wght=200,wdth=90.ttf | Bin 6760 -> 6760 bytes
 ....retain-all-codepoint.wght=650,wdth=85.ttf | Bin 6712 -> 6712 bytes
 ....retain-all-codepoint.wght=200,wdth=90.ttf | Bin 6440 -> 6440 bytes
 ....retain-all-codepoint.wght=650,wdth=85.ttf | Bin 6392 -> 6392 bytes
 ...-all-codepoint.wght=150,wdth=80,CTGR=0.ttf | Bin 1396 -> 1396 bytes
 ...-all-codepoint.wght=300,wdth=90,CTGR=0.ttf | Bin 1432 -> 1432 bytes
 ...tain-all-codepoint.wght=400,wdth=100.0.ttf | Bin 6804 -> 6804 bytes
 ...etain-all-codepoint.wght=drop,wdth=100.ttf | Bin 6804 -> 6804 bytes
 test/subset/generate-expected-outputs.py      |   3 ++-
 15 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/subset/data/expected/full_instance/Roboto-Variable.default.retain-all-codepoint.wght=150,wdth=80.ttf b/test/subset/data/expected/full_instance/Roboto-Variable.default.retain-all-codepoint.wght=150,wdth=80.ttf
index ca2aeeff6e314d44c9c9ad93a76bace4fcd65332..6c7a145896eb7cb61ffeb15a66902b18372bf6a1 100644
GIT binary patch
delta 89
zcmbR7hi%3mwh0?Vn4EQHF)%RBVPIe|%g9Jg<Xp#5G4aSg4i1lBO8=ZVWG8nqN-5oA
suDu-3Z}XKwngghgf#JvpK|K(C`_XxYUrK+ka>zCxW88j>kuhiw08v^V_5c6?

delta 89
zcmbR7hi%3mwh0?VnEiETF)%RBVPIe|%g9Jg<l4pAH1Wtj4o<IMQvbX-4JUUoN-5pE
sT)jV@-{vcWGzU-}1H+LIf_fnO_M`I(zoh<N<uq(Q#<=|$BV*7W0DcG`^#A|>

diff --git a/test/subset/data/expected/full_instance/Roboto-Variable.default.retain-all-codepoint.wght=300,wdth=90.ttf b/test/subset/data/expected/full_instance/Roboto-Variable.default.retain-all-codepoint.wght=300,wdth=90.ttf
index 04be94efe94c9a36fb3a89b8abcf0c6e0dadfd7d..02a3a6723001a2366b431ec02028d4fa7cf48cd0 100644
GIT binary patch
delta 89
zcmezKhwaZFwh0?Vm=5a9VqjpL!@$5`mXVQ~$fd*ab>fkI92|#!$^UcZm^ZnLQA(*O
tY-(UUzs*+$X%3(|28JUa1oc4l?MLSoe#!s6$}z9`7~}S1jEvj%007=DA(8+9

delta 89
zcmezKhwaZFwh0?VnEiETF)%RBVPIe|%g9Jg<l4pAH1Wtj4o<IMQvbX-4JUUoN+}h{
sO)-z>xB1E-%>h)$z;NV)pdN_6{ph^HFR8y*ISreSF>XJ`$hd6}0D_nwlmGw#

diff --git a/test/subset/data/expected/full_instance/Roboto-Variable.no-prune-unicode-ranges.retain-all-codepoint.wght=150,wdth=80.ttf b/test/subset/data/expected/full_instance/Roboto-Variable.no-prune-unicode-ranges.retain-all-codepoint.wght=150,wdth=80.ttf
index ca2aeeff6e314d44c9c9ad93a76bace4fcd65332..6c7a145896eb7cb61ffeb15a66902b18372bf6a1 100644
GIT binary patch
delta 89
zcmbR7hi%3mwh0?Vn4EQHF)%RBVPIe|%g9Jg<Xp#5G4aSg4i1lBO8=ZVWG8nqN-5oA
suDu-3Z}XKwngghgf#JvpK|K(C`_XxYUrK+ka>zCxW88j>kuhiw08v^V_5c6?

delta 89
zcmbR7hi%3mwh0?VnEiETF)%RBVPIe|%g9Jg<l4pAH1Wtj4o<IMQvbX-4JUUoN-5pE
sT)jV@-{vcWGzU-}1H+LIf_fnO_M`I(zoh<N<uq(Q#<=|$BV*7W0DcG`^#A|>

diff --git a/test/subset/data/expected/full_instance/Roboto-Variable.no-prune-unicode-ranges.retain-all-codepoint.wght=300,wdth=90.ttf b/test/subset/data/expected/full_instance/Roboto-Variable.no-prune-unicode-ranges.retain-all-codepoint.wght=300,wdth=90.ttf
index 04be94efe94c9a36fb3a89b8abcf0c6e0dadfd7d..02a3a6723001a2366b431ec02028d4fa7cf48cd0 100644
GIT binary patch
delta 89
zcmezKhwaZFwh0?Vm=5a9VqjpL!@$5`mXVQ~$fd*ab>fkI92|#!$^UcZm^ZnLQA(*O
tY-(UUzs*+$X%3(|28JUa1oc4l?MLSoe#!s6$}z9`7~}S1jEvj%007=DA(8+9

delta 89
zcmezKhwaZFwh0?VnEiETF)%RBVPIe|%g9Jg<l4pAH1Wtj4o<IMQvbX-4JUUoN+}h{
sO)-z>xB1E-%>h)$z;NV)pdN_6{ph^HFR8y*ISreSF>XJ`$hd6}0D_nwlmGw#

diff --git a/test/subset/data/expected/instance_feature_variations/MPLUS1-Variable.default.30DD.wght=100.ttf b/test/subset/data/expected/instance_feature_variations/MPLUS1-Variable.default.30DD.wght=100.ttf
index 2f3e913a591838c3f9f912da368e7025096ea320..702609418d7fe288b00f71a31ccb3f2f7f16daf8 100644
GIT binary patch
delta 122
zcmdnOy@h+i1QD4}LX`{*Oj8&b7|b#<QWH6PnJ!FRqRY(5;4$%vE_01g<YX4ccu98#
zHlPXy21YQ6L`<$>)Z$=%!Jxpv%KUipIz~A*21$k#=9bBq7*Db6c%fxHc>$9I2ZO@@
PH_VTj!#5vb`oaVN+2kIB

delta 122
zcmdnOy@h+i1QDHRp(6|oOj8&b7|b#<QWM3$3ml)gM3-5MQFG!IU1lS}_{l7c@sc+f
zWEuP!*cljs>JWgLfpKyTqZWsV$p58(F9;u>ypB<h?cbIESuAyvFEO5Csh-07aPk5s
U36B3u|9uiZ&N6570j4iZ0QTf2egFUf

diff --git a/test/subset/data/expected/instance_feature_variations/MPLUS1-Variable.default.30DD.wght=400.ttf b/test/subset/data/expected/instance_feature_variations/MPLUS1-Variable.default.30DD.wght=400.ttf
index 3dc7fe39e83a1d3562f84bbfdcb378864ff53e1b..a01f7bc7a63cd2b029d7a2c4d3591212640f0022 100644
GIT binary patch
delta 147
zcmdnMyMcGY1QD6HLKzGUOeG8q3}zV_sfipNOcy3D(Pidh@R)c-m$_HSV=@b4vZOl$
z8&CxU10$G3A|^L5YUwb)V31~DWqyny&BVYcz`*$B9}n{jpc+YrVCJcluQ4uTk^6A#
Y_~ZsA2@VG7|F@YRGly?pz$Cx|0L<SYNdN!<

delta 147
zcmdnMyMcGY1QDHRp(6|oOeG8q3}zV_sfps>1&&W#qRXt!s5$Y9F0+wf{A3o!WXT&0
zvJCzV><o-RbqK)Bz&N>qQA<Ze<p0vY7le<aNdwJgU=(0r{PK^7`33Wfe^>rzvD8hz
f#<+~-;i`RxlN*>MIQ}pF_euCT%bd*%m;_h=Q1mE8

diff --git a/test/subset/data/expected/instantiate_glyf/Roboto-Variable.ABC.default.retain-all-codepoint.wght=200,wdth=90.ttf b/test/subset/data/expected/instantiate_glyf/Roboto-Variable.ABC.default.retain-all-codepoint.wght=200,wdth=90.ttf
index fee5f9d4d7fb2b8be4e955a66a546ce0cd1a385c..190aee18057756dc3804a607640cab1a50579e9c 100644
GIT binary patch
delta 125
zcmaE1^1@`o1`(EJI*beqOaTlG3}zV_sfj!S%qkO)=rYgXzdrFxx~d@qGf)PofI)yk
zpJ5h|@r=I|ECLZ{_@Bj)GP#jaM2G=s413N$9tH-Mw+w0wYAiLAmoaW)F)*t-IXQ+&
Uf`dWr|7(^S)+3v1nBIs305fzR(EtDd

delta 125
zcmaE1^1@`o1`%d|ommVFOaTlG3}zV_sfk>>SeH&bqRYHR;Ml}3>8dLkL>bB$*cq4@
z1Q_%gKq{Z{mohLjFaj|c{Lf-YncT=IA_Np-V9)u-!@$7l^-JoX7pLLmWsI9xOe2c6
XPmW=d;P@r=_bR6$NAczwrZ?gMPfQ}u

diff --git a/test/subset/data/expected/instantiate_glyf/Roboto-Variable.ABC.default.retain-all-codepoint.wght=650,wdth=85.ttf b/test/subset/data/expected/instantiate_glyf/Roboto-Variable.ABC.default.retain-all-codepoint.wght=650,wdth=85.ttf
index 2b44f1fe075201cf17f9f34d3ab046b7a42bfa4b..38264db3eef69af63fe528456b9f350ca51fc74b 100644
GIT binary patch
delta 125
zcmdmCvcqJ;1`$>^9cBgwrT_*82D6Ne)I^>FW`&7IbeU)HU!V9TUDc2QC<_Ek3<3=L
z46}fYXZ)pL5r{a$|15@-$&HL6LJW)y4D31oco-O1{xb+O2(Y}Lyo_-Zi=bZY=gBcl
U5*!S||KG5@XFa;PhG~yD0PAHQqyPW_

delta 125
zcmdmCvcqJ;1`%d|ommVFOaTlG3}zV_sfk>>SeH&bqRYHR;Ml}3>8dLkL>bB$*cq4@
z1Q_%gKq{Z{mohLjFaj|c{Lf-YncT=IA_Np-V9)u-!@$7l^-JoX7pLLmWsI9x#4m*2
XogBj?!SPG#?^RAij^fQVOnbxuC_W;h

diff --git a/test/subset/data/expected/instantiate_glyf/Roboto-Variable.composite.default.retain-all-codepoint.wght=200,wdth=90.ttf b/test/subset/data/expected/instantiate_glyf/Roboto-Variable.composite.default.retain-all-codepoint.wght=200,wdth=90.ttf
index 060f7356899f720fb4cbbcd0286a0200d33f97a9..0fa5526636647c30450e9f315ec4bde6cb4fb834 100644
GIT binary patch
delta 144
zcmZ2sw8Ch@1`)Pnx|0|fm~t2x7|b#<QWN<MS$QWO(Pdu3e|O@Sc2!9RHU?P+b_ON}
z0S0}BSwNM~_)CF2Mh0e}4j}lS#gH<2A)|;8P>6v&=N}IP1KVi^Ee0dDnUjw(u2VU(
nexGnWzs*+$X%4XZBOe6yK#bdu&MN?wF|f^Kci23GX@VF4;lU$2

delta 144
zcmZ2sw8Ch@1`%d|ommVFOgRh;3}zV_sfk>>SeHyZqRYHR;Ml}3?W!voL>bB$*cq4@
z1Q_%gKq{Z{mohLjFaj|c{Lf-YnY@ruL<lIvz@GDuhk=39>zC9&FHXbB#~9bCT*}_d
m9M5m_l|h;Vtp3OcK|K)T_M`I(zoh<N<uv3d-aLb8f*1hT94I&d

diff --git a/test/subset/data/expected/instantiate_glyf/Roboto-Variable.composite.default.retain-all-codepoint.wght=650,wdth=85.ttf b/test/subset/data/expected/instantiate_glyf/Roboto-Variable.composite.default.retain-all-codepoint.wght=650,wdth=85.ttf
index 9ed86290b89b8ac86ec9efd3a4b4b647803be18d..4b07bbc60efcdf02a653be085d69e96c19008e01 100644
GIT binary patch
delta 144
zcmexi_``6*1`)RHx>Fb!m~t2x7|b#<QWN=<SnVes(Pdu3e|O@Sc2!9RHU?P+b_ON}
z0S0}BSwNM~_)CF2Mh0e}4j}lS#gH<2A)|;8P>6v&=N}IP1KV2$P6j8o)sv4gu2Yfv
n?HC)+Z}XKwnggu<$Ol0^5aafv^9n#^3~Z~}oi@*4N)Q78F-Rjs

delta 144
zcmexi_``6*1`%d|ommVFOgRh;3}zV_sfk>>SeHyZqRYHR;Ml}3?W!voL>bB$*cq4@
z1Q_%gKq{Z{mohLjFaj|c{Lf-YnY@ruL<lIvz@GDuhk=39>zC9&FHXbB#~9bCXjD6F
mjpw)d${@`FR)6G!pdN^E`_XxYUs8XsavE|JZ=S)FAO-*(wkSaW

diff --git a/test/subset/data/expected/mvar_full_instance/NotoSans-VF.abc.no-layout.retain-all-codepoint.wght=150,wdth=80,CTGR=0.ttf b/test/subset/data/expected/mvar_full_instance/NotoSans-VF.abc.no-layout.retain-all-codepoint.wght=150,wdth=80,CTGR=0.ttf
index 7b086cbe8b216f17c5dbfca301319c10055479fa..5a46c6482ef80deb855a930c8be18f3c89bfe144 100644
GIT binary patch
delta 103
zcmeyu^@VFffQYQCwFLtMV*vvLgIPvKY9gCBW5C1|U1oL$t%*~-q!=_An1E716<`vH
tnD|4BgDHYRi$Q{M-()RDKb9>GJDexiFiLPRX#M}jxR2?_<~fWvm;oL<7X$zR

delta 103
zcmeyu^@VFffQa$~s}Bqej0Fq~3}zV_sfj$B*?T6Y=rXG_Zk#y9ON!B&L4u)>fsKI?
zr~m<27+5C$(Bj~h_&fRU6s`}GwHW<aW?ow9JGq8Yg5&Sxf7M(cShP3KVZ6Z%0H6CE
A{{R30

diff --git a/test/subset/data/expected/mvar_full_instance/NotoSans-VF.abc.no-layout.retain-all-codepoint.wght=300,wdth=90,CTGR=0.ttf b/test/subset/data/expected/mvar_full_instance/NotoSans-VF.abc.no-layout.retain-all-codepoint.wght=300,wdth=90,CTGR=0.ttf
index 0f8151196bc68006534a3d51560991f4974ac9ef..dad34894b4d206d1f16b75725e8450949dcc4896 100644
GIT binary patch
delta 103
zcmbQiJ%f8ffQW3ZwFLtMV*vvLgIPvKY9gCIW5~o5U1oL$t%*~-q!=_An1E716<`vH
unD|4BgDHYRhe3w%%VaG^KbCp?mmW^8VU*xt(E0z3@e9+B&2t$4FarPxLl=tx

delta 103
zcmbQiJ%f8ffQa$~s}Bqej0Fq~3}zV_sfj$B*?T6Y=rXG_Zk#y9ON!B&L4u)>fsKI?
zr~m<27+5C$(Bj~h_&fRU6s`}GwHW<aS{x65o?OEy!SQ$UziO@zEZUprF#cf%09a%l
AhX4Qo

diff --git a/test/subset/data/expected/pin_all_at_default/Roboto-Variable.ABC.default.retain-all-codepoint.wght=400,wdth=100.0.ttf b/test/subset/data/expected/pin_all_at_default/Roboto-Variable.ABC.default.retain-all-codepoint.wght=400,wdth=100.0.ttf
index 1523a99f9e018230144e18725fcf1e4d7bc1e830..adceacd3200f70728528c222f3f62abc50d6f5ed 100644
GIT binary patch
delta 125
zcmbPYI>mIt1`$?!9VP|_rT_*82D6Ne)I^?@%*hjv=rYgXzdrFxx~d@qGf)PofI)yk
zpJ5h|@r=I|ECLZ{_@Bj)GP#jaM2LZrfq^~e9}fcqs|ABBgA}XW<YkPTSfUp?zn>h#
UB*DQT`~MBA9P5$IHB1r`0P6r8#Q*>R

delta 125
zcmbPYI>mIt1`%d|ommVFOaTlG3}zV_sfk>>SeH&bqRYHR;Ml}3>8dLkL>bB$*cq4@
z1Q_%gKq{Z{mohLjFaj|c{Lf-YncT=IA_Np-V9)u-!@$7l^-JoX7pLLmWsI9xlGSZu
XC&w^JaQu?`dzI6Wqj+--lY|5S@--mC

diff --git a/test/subset/data/expected/pin_all_at_default/Roboto-Variable.ABC.default.retain-all-codepoint.wght=drop,wdth=100.ttf b/test/subset/data/expected/pin_all_at_default/Roboto-Variable.ABC.default.retain-all-codepoint.wght=drop,wdth=100.ttf
index 1523a99f9e018230144e18725fcf1e4d7bc1e830..adceacd3200f70728528c222f3f62abc50d6f5ed 100644
GIT binary patch
delta 125
zcmbPYI>mIt1`$?!9VP|_rT_*82D6Ne)I^?@%*hjv=rYgXzdrFxx~d@qGf)PofI)yk
zpJ5h|@r=I|ECLZ{_@Bj)GP#jaM2LZrfq^~e9}fcqs|ABBgA}XW<YkPTSfUp?zn>h#
UB*DQT`~MBA9P5$IHB1r`0P6r8#Q*>R

delta 125
zcmbPYI>mIt1`%d|ommVFOaTlG3}zV_sfk>>SeH&bqRYHR;Ml}3>8dLkL>bB$*cq4@
z1Q_%gKq{Z{mohLjFaj|c{Lf-YncT=IA_Np-V9)u-!@$7l^-JoX7pLLmWsI9xlGSZu
XC&w^JaQu?`dzI6Wqj+--lY|5S@--mC

diff --git a/test/subset/generate-expected-outputs.py b/test/subset/generate-expected-outputs.py
index 2b7a87f29..53fb774a1 100755
--- a/test/subset/generate-expected-outputs.py
+++ b/test/subset/generate-expected-outputs.py
@@ -33,7 +33,6 @@ def generate_expected_output(input_file, unicodes, profile_flags, instance_flags
 		instance_path = os.path.join(tempfile.mkdtemp (), font_name)
 		args = ["fonttools", "varLib.instancer",
 			"--no-overlap-flag",
-			"--no-recalc-bounds",
 			"--no-recalc-timestamp",
 			"--output=%s" % instance_path,
 			input_file]
@@ -43,6 +42,8 @@ def generate_expected_output(input_file, unicodes, profile_flags, instance_flags
 
 	fonttools_path = os.path.join(tempfile.mkdtemp (), font_name)
 	args = ["fonttools", "subset", input_path]
+	if instance_flags:
+		args.extend(["--recalc-bounds"])
 	args.extend(["--drop-tables+=DSIG",
 		     "--drop-tables-=sbix",
 		     "--no-harfbuzz-repacker", # disable harfbuzz repacker so we aren't comparing to ourself.