[mono/mono] [2 commits] 6923ba9c: Fixed a test failure that occurs when the specified font is not installed.

"alexrp ([email protected])" <[email protected]> Wed, 20 Nov 2013 05:07:19 +0000
Newsgroups	gmane.comp.gnome.mono.patches
Message-ID	<0000014273e7c87a-6821a0de-40bf-4250-a544-db056e607e76-000000@email.amazonses.com>
DQogICBCcmFuY2g6IHJlZnMvaGVhZHMvbWFzdGVyDQogICAgIEhvbWU6IGh0dHBzOi8vZ2l0aHVi
LmNvbS9tb25vL21vbm8NCiAgQ29tcGFyZTogaHR0cHM6Ly9naXRodWIuY29tL21vbm8vbW9uby9j
b21wYXJlLzExNGI1NDVhMmM2ZC4uLjlhNTg3YjUyNjZiOA0KDQogICBDb21taXQ6IDY5MjNiYTlj
MDIyY2FiYThmNmYyMGNmNDFkZTA2YzIyMmJlNTg3ZjINCiAgIEF1dGhvcjogQWxleGFuZGVyIEvD
tnBsaW5nZXIgPGFsZXgua29lcGxpbmdlckBvdXRsb29rLmNvbT4gKGFrb2VwbGluZ2VyKQ0KICAg
ICBEYXRlOiAyMDEzLTExLTEyIDE4OjA3OjI1IEdNVA0KICAgICAgVVJMOiBodHRwczovL2dpdGh1
Yi5jb20vbW9uby9tb25vL2NvbW1pdC82OTIzYmE5YzAyMmNhYmE4ZjZmMjBjZjQxZGUwNmMyMjJi
ZTU4N2YyDQoNCkZpeGVkIGEgdGVzdCBmYWlsdXJlIHRoYXQgb2NjdXJzIHdoZW4gdGhlIHNwZWNp
ZmllZCBmb250IGlzIG5vdCBpbnN0YWxsZWQuCgpPbiBzeXN0ZW1zIHdoZXJlICdMaWJlcmF0aW9u
IFNhbnMnIGlzIG5vdCBpbnN0YWxsZWQgb3V0LW9mLXRoZS1ib3gKKGUuZy4gVWJ1bnR1IFNlcnZl
ciwgT3BlblN1c2UgU2VydmVyKSBpdCBmYWxscyBiYWNrIHRvICdEZWphVnUgU2FucycsCndoaWNo
IG1ha2VzIHRoZSBHZXRIYXNoQ29kZV9OYW1lRGlmZmVyc19IYXNoZXNOb3RFcXVhbCgpIHRlc3Qg
ZmFpbCBhcwp0aGUgdHdvIGZvbnQgbmFtZXMgYXJlIG5vdyBlcXVhbC4gSW5zdGVhZCB3ZSB1c2Ug
J0FyaWFsJyBhbmQgJ0NvdXJpZXIgTmV3Jwp3aGljaCByZXNvbHZlIHRvIGRpZmZlcmVudCBmb250
cyBvbiBtb3N0IHN5c3RlbXMuCgpDaGFuZ2VzIGxpY2Vuc2VkIHVuZGVyIE1JVC9YMTEuDQoNCkNo
YW5nZWQgcGF0aHM6CiAgTSBtY3MvY2xhc3MvU3lzdGVtLkRyYXdpbmcvVGVzdC9TeXN0ZW0uRHJh
d2luZy9UZXN0Rm9udC5jcwoNCk1vZGlmaWVkOiBtY3MvY2xhc3MvU3lzdGVtLkRyYXdpbmcvVGVz
dC9TeXN0ZW0uRHJhd2luZy9UZXN0Rm9udC5jcw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KQEAgLTYzNSw4ICs2MzUs
OCBAQCBwdWJsaWMgdm9pZCBGb250VW5pcXVlSGFzaENvZGUgKCkKICAgICAgICAgW1Rlc3RdCiAg
ICAgICAgIHB1YmxpYyB2b2lkIEdldEhhc2hDb2RlX1VuaXREaWZmZXJzX0hhc2hlc05vdEVxdWFs
KCkKICAgICAgICAgewotICAgICAgICAgICAgRm9udCBmMSA9IG5ldyBGb250KCJEZWphVnUgU2Fu
cyIsIDguMjVGLCBHcmFwaGljc1VuaXQuUG9pbnQpOwotICAgICAgICAgICAgRm9udCBmMiA9IG5l
dyBGb250KCJEZWphVnUgU2FucyIsIDguMjVGLCBHcmFwaGljc1VuaXQuUGl4ZWwpOworICAgICAg
ICAgICAgRm9udCBmMSA9IG5ldyBGb250KCJBcmlhbCIsIDguMjVGLCBHcmFwaGljc1VuaXQuUG9p
bnQpOworICAgICAgICAgICAgRm9udCBmMiA9IG5ldyBGb250KCJBcmlhbCIsIDguMjVGLCBHcmFw
aGljc1VuaXQuUGl4ZWwpOwogCiAgICAgICAgICAgICBBc3NlcnQuSXNGYWxzZShmMS5HZXRIYXNo
Q29kZSgpID09IGYyLkdldEhhc2hDb2RlKCksCiAgICAgICAgICAgICAgICAgIkhhc2hjb2RlcyBz
aG91bGQgZGlmZmVyIGlmIF91bml0IG1lbWJlciBkaWZmZXJzIik7CkBAIC02NDUsOCArNjQ1LDgg
QEAgcHVibGljIHZvaWQgR2V0SGFzaENvZGVfVW5pdERpZmZlcnNfSGFzaGVzTm90RXF1YWwoKQog
ICAgICAgICBbVGVzdF0KICAgICAgICAgcHVibGljIHZvaWQgR2V0SGFzaENvZGVfTmFtZURpZmZl
cnNfSGFzaGVzTm90RXF1YWwoKQogICAgICAgICB7Ci0gICAgICAgICAgICBGb250IGYxID0gbmV3
IEZvbnQoIkRlamFWdSBTYW5zIiwgOC4yNUYsIEdyYXBoaWNzVW5pdC5Qb2ludCk7Ci0gICAgICAg
ICAgICBGb250IGYyID0gbmV3IEZvbnQoIkxpYmVyYXRpb24gU2FucyIsIDguMjVGLCBHcmFwaGlj
c1VuaXQuUG9pbnQpOworICAgICAgICAgICAgRm9udCBmMSA9IG5ldyBGb250KCJBcmlhbCIsIDgu
MjVGLCBHcmFwaGljc1VuaXQuUG9pbnQpOworICAgICAgICAgICAgRm9udCBmMiA9IG5ldyBGb250
KCJDb3VyaWVyIE5ldyIsIDguMjVGLCBHcmFwaGljc1VuaXQuUG9pbnQpOwogCiAgICAgICAgICAg
ICBBc3NlcnQuSXNGYWxzZShmMS5HZXRIYXNoQ29kZSgpID09IGYyLkdldEhhc2hDb2RlKCksCiAg
ICAgICAgICAgICAgICAgIkhhc2hjb2RlcyBzaG91bGQgZGlmZmVyIGlmIF9uYW1lIG1lbWJlciBk
aWZmZXJzIik7CkBAIC02NTUsOCArNjU1LDggQEAgcHVibGljIHZvaWQgR2V0SGFzaENvZGVfTmFt
ZURpZmZlcnNfSGFzaGVzTm90RXF1YWwoKQogICAgICAgICBbVGVzdF0KICAgICAgICAgcHVibGlj
IHZvaWQgR2V0SGFzaENvZGVfU3R5bGVFcXVhbHNHZGlDaGFyU2V0X0hhc2hlc05vdEVxdWFsKCkK
ICAgICAgICAgewotICAgICAgICAgICAgRm9udCBmMSA9IG5ldyBGb250KCJEZWphVnUgU2FucyIs
IDguMjVGLCBGb250U3R5bGUuUmVndWxhciwgR3JhcGhpY3NVbml0LlBvaW50LCAoKGJ5dGUpKDAp
KSk7Ci0gICAgICAgICAgICBGb250IGYyID0gbmV3IEZvbnQoIkRlamFWdSBTYW5zIiwgOC4yNUYs
IEZvbnRTdHlsZS5Cb2xkLCBHcmFwaGljc1VuaXQuUG9pbnQsICgoYnl0ZSkoMSkpKTsKKyAgICAg
ICAgICAgIEZvbnQgZjEgPSBuZXcgRm9udCgiQXJpYWwiLCA4LjI1RiwgRm9udFN0eWxlLlJlZ3Vs
YXIsIEdyYXBoaWNzVW5pdC5Qb2ludCwgKChieXRlKSgwKSkpOworICAgICAgICAgICAgRm9udCBm
MiA9IG5ldyBGb250KCJBcmlhbCIsIDguMjVGLCBGb250U3R5bGUuQm9sZCwgR3JhcGhpY3NVbml0
LlBvaW50LCAoKGJ5dGUpKDEpKSk7CiAKICAgICAgICAgICAgIEFzc2VydC5Jc0ZhbHNlKGYxLkdl
dEhhc2hDb2RlKCkgPT0gZjIuR2V0SGFzaENvZGUoKSwKICAgICAgICAgICAgICAgICAiSGFzaGNv
ZGVzIHNob3VsZCBkaWZmZXIgaWYgX3N0eWxlIG1lbWJlciBkaWZmZXJzIik7DQoNCiAgIENvbW1p
dDogOWE1ODdiNTI2NmI4ZGJiMzBjOGU0Yzg4ODNmYWFiY2ZjNGM0YjZkMg0KICAgQXV0aG9yOiBB
bGV4IFLDuG5uZSBQZXRlcnNlbiA8YWxleEBseWN1cy5vcmc+IChhbGV4cnApDQogICAgIERhdGU6
IDIwMTMtMTEtMjAgMDU6MDM6MDcgR01UDQogICAgICBVUkw6IGh0dHBzOi8vZ2l0aHViLmNvbS9t
b25vL21vbm8vY29tbWl0LzlhNTg3YjUyNjZiOGRiYjMwYzhlNGM4ODgzZmFhYmNmYzRjNGI2ZDIN
Cg0KTWVyZ2UgcHVsbCByZXF1ZXN0ICM4MDcgZnJvbSBha29lcGxpbmdlci9maXgtZm9udHRlc3QK
CkZpeGVkIGEgdGVzdCBmYWlsdXJlIHRoYXQgb2NjdXJzIHdoZW4gdGhlIHNwZWNpZmllZCBmb250
IGlzIG5vdCBpbnN0YWxsZWQNCg0KQ2hhbmdlZCBwYXRoczoKICBNIG1jcy9jbGFzcy9TeXN0ZW0u
RHJhd2luZy9UZXN0L1N5c3RlbS5EcmF3aW5nL1Rlc3RGb250LmNzCg0KTW9kaWZpZWQ6IG1jcy9j
bGFzcy9TeXN0ZW0uRHJhd2luZy9UZXN0L1N5c3RlbS5EcmF3aW5nL1Rlc3RGb250LmNzDQo9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09DQpAQCAtNjM1LDggKzYzNSw4IEBAIHB1YmxpYyB2b2lkIEZvbnRVbmlxdWVIYXNoQ29k
ZSAoKQogICAgICAgICBbVGVzdF0KICAgICAgICAgcHVibGljIHZvaWQgR2V0SGFzaENvZGVfVW5p
dERpZmZlcnNfSGFzaGVzTm90RXF1YWwoKQogICAgICAgICB7Ci0gICAgICAgICAgICBGb250IGYx
ID0gbmV3IEZvbnQoIkRlamFWdSBTYW5zIiwgOC4yNUYsIEdyYXBoaWNzVW5pdC5Qb2ludCk7Ci0g
ICAgICAgICAgICBGb250IGYyID0gbmV3IEZvbnQoIkRlamFWdSBTYW5zIiwgOC4yNUYsIEdyYXBo
aWNzVW5pdC5QaXhlbCk7CisgICAgICAgICAgICBGb250IGYxID0gbmV3IEZvbnQoIkFyaWFsIiwg
OC4yNUYsIEdyYXBoaWNzVW5pdC5Qb2ludCk7CisgICAgICAgICAgICBGb250IGYyID0gbmV3IEZv
bnQoIkFyaWFsIiwgOC4yNUYsIEdyYXBoaWNzVW5pdC5QaXhlbCk7CiAKICAgICAgICAgICAgIEFz
c2VydC5Jc0ZhbHNlKGYxLkdldEhhc2hDb2RlKCkgPT0gZjIuR2V0SGFzaENvZGUoKSwKICAgICAg
ICAgICAgICAgICAiSGFzaGNvZGVzIHNob3VsZCBkaWZmZXIgaWYgX3VuaXQgbWVtYmVyIGRpZmZl
cnMiKTsKQEAgLTY0NSw4ICs2NDUsOCBAQCBwdWJsaWMgdm9pZCBHZXRIYXNoQ29kZV9Vbml0RGlm
ZmVyc19IYXNoZXNOb3RFcXVhbCgpCiAgICAgICAgIFtUZXN0XQogICAgICAgICBwdWJsaWMgdm9p
ZCBHZXRIYXNoQ29kZV9OYW1lRGlmZmVyc19IYXNoZXNOb3RFcXVhbCgpCiAgICAgICAgIHsKLSAg
ICAgICAgICAgIEZvbnQgZjEgPSBuZXcgRm9udCgiRGVqYVZ1IFNhbnMiLCA4LjI1RiwgR3JhcGhp
Y3NVbml0LlBvaW50KTsKLSAgICAgICAgICAgIEZvbnQgZjIgPSBuZXcgRm9udCgiTGliZXJhdGlv
biBTYW5zIiwgOC4yNUYsIEdyYXBoaWNzVW5pdC5Qb2ludCk7CisgICAgICAgICAgICBGb250IGYx
ID0gbmV3IEZvbnQoIkFyaWFsIiwgOC4yNUYsIEdyYXBoaWNzVW5pdC5Qb2ludCk7CisgICAgICAg
ICAgICBGb250IGYyID0gbmV3IEZvbnQoIkNvdXJpZXIgTmV3IiwgOC4yNUYsIEdyYXBoaWNzVW5p
dC5Qb2ludCk7CiAKICAgICAgICAgICAgIEFzc2VydC5Jc0ZhbHNlKGYxLkdldEhhc2hDb2RlKCkg
PT0gZjIuR2V0SGFzaENvZGUoKSwKICAgICAgICAgICAgICAgICAiSGFzaGNvZGVzIHNob3VsZCBk
aWZmZXIgaWYgX25hbWUgbWVtYmVyIGRpZmZlcnMiKTsKQEAgLTY1NSw4ICs2NTUsOCBAQCBwdWJs
aWMgdm9pZCBHZXRIYXNoQ29kZV9OYW1lRGlmZmVyc19IYXNoZXNOb3RFcXVhbCgpCiAgICAgICAg
IFtUZXN0XQogICAgICAgICBwdWJsaWMgdm9pZCBHZXRIYXNoQ29kZV9TdHlsZUVxdWFsc0dkaUNo
YXJTZXRfSGFzaGVzTm90RXF1YWwoKQogICAgICAgICB7Ci0gICAgICAgICAgICBGb250IGYxID0g
bmV3IEZvbnQoIkRlamFWdSBTYW5zIiwgOC4yNUYsIEZvbnRTdHlsZS5SZWd1bGFyLCBHcmFwaGlj
c1VuaXQuUG9pbnQsICgoYnl0ZSkoMCkpKTsKLSAgICAgICAgICAgIEZvbnQgZjIgPSBuZXcgRm9u
dCgiRGVqYVZ1IFNhbnMiLCA4LjI1RiwgRm9udFN0eWxlLkJvbGQsIEdyYXBoaWNzVW5pdC5Qb2lu
dCwgKChieXRlKSgxKSkpOworICAgICAgICAgICAgRm9udCBmMSA9IG5ldyBGb250KCJBcmlhbCIs
IDguMjVGLCBGb250U3R5bGUuUmVndWxhciwgR3JhcGhpY3NVbml0LlBvaW50LCAoKGJ5dGUpKDAp
KSk7CisgICAgICAgICAgICBGb250IGYyID0gbmV3IEZvbnQoIkFyaWFsIiwgOC4yNUYsIEZvbnRT
dHlsZS5Cb2xkLCBHcmFwaGljc1VuaXQuUG9pbnQsICgoYnl0ZSkoMSkpKTsKIAogICAgICAgICAg
ICAgQXNzZXJ0LklzRmFsc2UoZjEuR2V0SGFzaENvZGUoKSA9PSBmMi5HZXRIYXNoQ29kZSgpLAog
ICAgICAgICAgICAgICAgICJIYXNoY29kZXMgc2hvdWxkIGRpZmZlciBpZiBfc3R5bGUgbWVtYmVy
IGRpZmZlcnMiKTsNCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fCk1vbm8tcGF0Y2hlcyBtYWlsbGlzdCAgLSAgTW9uby1wYXRjaGVzQGxpc3RzLnhpbWlhbi5j
b20KaHR0cDovL2xpc3RzLnhpbWlhbi5jb20vbWFpbG1hbi9saXN0aW5mby9tb25vLXBhdGNoZXMK