[Mono-list] Diff for someone to approve and apply

[bucky@phantom.keystreams.com]

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.
  Send mail to mime@docserver.cac.washington.edu for more info.

--8323328-384888462-1013202924=:19299
Content-Type: TEXT/PLAIN; charset=US-ASCII

Attached are changes for
'mcs/class/corlib/Test/System.Resources/ResourceReaderTest.cs'.

The changes take care of a few errors and failures when running 'make
test'.

I don't have CVS write access, so could somebody check this over, and, if
it looks good, apply it?

Thanks,
David


--8323328-384888462-1013202924=:19299
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="ResourceReaderTest.diff"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.LNX.4.21.0202081315240.19299@phantom.keystreams.com>
Content-Description: ResourceReaderTest.diff
Content-Disposition: attachment; filename="ResourceReaderTest.diff"

PyBmaWxlLmRpZmYNCkluZGV4OiBSZXNvdXJjZVJlYWRlclRlc3QuY3MNCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvbW9uby9tY3MvY2xh
c3MvY29ybGliL1Rlc3QvU3lzdGVtLlJlc291cmNlcy9SZXNvdXJjZVJlYWRl
clRlc3QuY3Msdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjMNCmRpZmYgLXUg
LXIxLjMgUmVzb3VyY2VSZWFkZXJUZXN0LmNzDQotLS0gUmVzb3VyY2VSZWFk
ZXJUZXN0LmNzCTI1IEphbiAyMDAyIDExOjQ5OjU5IC0wMDAwCTEuMw0KKysr
IFJlc291cmNlUmVhZGVyVGVzdC5jcwk4IEZlYiAyMDAyIDIxOjAyOjUzIC0w
MDAwDQpAQCAtMzQsNiArMzQsMzEgQEANCiAJCXByb3RlY3RlZCBvdmVycmlk
ZSB2b2lkIFNldFVwKCkgew0NCiAJCX0NDQogDQ0KKwkJcHJpdmF0ZSBzdGF0
aWMgc3RyaW5nIEdldFJlc291cmNlRmlsZSgpDQorCQl7DQorCQkJc3RyaW5n
IGZpbGVuYW1lID0gbV9SZXNvdXJjZUZpbGU7DQorCQkJLy9Db25zb2xlLldy
aXRlTGluZSgiUlJUOjpHUkYgOiBUcnlpbmcgZmlsZW5hbWUgIiArIGZpbGVu
YW1lKTsNCisJCQlpZiAoRmlsZS5FeGlzdHMoZmlsZW5hbWUpKSB7DQorCQkJ
CXJldHVybiBmaWxlbmFtZTsNCisJCQl9DQorCQkJZmlsZW5hbWUgPSBEaXJl
Y3RvcnkuR2V0Q3VycmVudERpcmVjdG9yeSgpICsgIlxcU3lzdGVtLlJlc291
cmNlc1xcIiArIGZpbGVuYW1lOw0KKwkJCS8vQ29uc29sZS5Xcml0ZUxpbmUo
IlJSVDo6R1JGIDogVHJ5aW5nIGZpbGVuYW1lICIgKyBmaWxlbmFtZSk7DQor
CQkJaWYgKEZpbGUuRXhpc3RzKGZpbGVuYW1lKSkgew0KKwkJCQlyZXR1cm4g
ZmlsZW5hbWU7DQorCQkJfQ0KKwkJCWZpbGVuYW1lID0gRGlyZWN0b3J5Lkdl
dFBhcmVudChEaXJlY3RvcnkuR2V0Q3VycmVudERpcmVjdG9yeSgpKS5Ub1N0
cmluZygpICsgIlxcIiArIG1fUmVzb3VyY2VGaWxlOw0KKwkJCS8vQ29uc29s
ZS5Xcml0ZUxpbmUoIlJSVDo6R1JGIDogVHJ5aW5nIGZpbGVuYW1lICIgKyBm
aWxlbmFtZSk7DQorCQkJaWYgKEZpbGUuRXhpc3RzKGZpbGVuYW1lKSkgew0K
KwkJCQlyZXR1cm4gZmlsZW5hbWU7DQorCQkJfQ0KKwkJCXJldHVybiBudWxs
Ow0KKwkJfQ0KKw0KKwkJcHVibGljIHZvaWQgVGVzdEZpbmRSZXNvdXJjZUZp
bGUoKSB7DQorCQkJc3RyaW5nIHJlc291cmNlRmlsZSA9IEdldFJlc291cmNl
RmlsZSgpOw0KKwkJCUFzc2VydCgiTnVsbCByZXNvdXJjZSBmaWxlIiwgcmVz
b3VyY2VGaWxlICE9IG51bGwpOw0KKwkJfQ0KKw0KIAkJcHVibGljIHZvaWQg
VGVzdENvbnN0cnVjdG9yU3RyaW5nRXhjZXB0aW9ucygpIHsNDQogCQkJUmVz
b3VyY2VSZWFkZXIgcjsNDQogCQkJdHJ5IHsNDQpAQCAtNTcsMTIgKzgyLDEz
IEBADQogCQl9DQ0KIA0NCiAJCXB1YmxpYyB2b2lkIFRlc3RDb25zdHJ1Y3Rv
clN0cmluZygpIHsNDQotCQkJaWYgKCFGaWxlLkV4aXN0cyhtX1Jlc291cmNl
RmlsZSkpIHsNDQotCQkJCUZhaWwoIlJlc291cmNlIGZpbGUgaXMgbm90IHdo
ZXJlIGl0IHNob3VsZCBiZToiICsgRGlyZWN0b3J5LkdldEN1cnJlbnREaXJl
Y3RvcnkoKSsgIlxcIiArIG1fUmVzb3VyY2VGaWxlKTsNDQorCQkJc3RyaW5n
IHJlc291cmNlRmlsZSA9IEdldFJlc291cmNlRmlsZSgpOw0KKwkJCWlmICgh
RmlsZS5FeGlzdHMocmVzb3VyY2VGaWxlKSkgew0NCisJCQkJRmFpbCgiUmVz
b3VyY2UgZmlsZSBpcyBub3Qgd2hlcmUgaXQgc2hvdWxkIGJlOiIgKyBEaXJl
Y3RvcnkuR2V0Q3VycmVudERpcmVjdG9yeSgpKyAiXFwiICsgcmVzb3VyY2VG
aWxlKTsNDQogCQkJfQ0NCiAJCQlSZXNvdXJjZVJlYWRlciByID0gbnVsbDsN
DQogCQkJdHJ5IHsNDQotCQkJCXIgPSBuZXcgUmVzb3VyY2VSZWFkZXIobV9S
ZXNvdXJjZUZpbGUpOw0NCisJCQkJciA9IG5ldyBSZXNvdXJjZVJlYWRlcihy
ZXNvdXJjZUZpbGUpOw0NCiAJCQl9DQ0KIAkJCWNhdGNoIHsNDQogCQkJCUZh
aWwoIlNob3VsZCBoYXZlIGJlZW4gYWJsZSB0byBvcGVuIHJlc291cmNlIGZp
bGUuIik7DQ0KQEAgLTgyLDcgKzEwOCw3IEBADQogCQkJfSBjYXRjaHt9DQ0K
IA0NCiAJCQl0cnkgew0NCi0JCQkJU3RyZWFtIHN0cmVhbSA9IG5ldyBGaWxl
U3RyZWFtIChtX1Jlc291cmNlRmlsZSwgRmlsZU1vZGUuT3Blbik7DQ0KKwkJ
CQlTdHJlYW0gc3RyZWFtID0gbmV3IEZpbGVTdHJlYW0gKEdldFJlc291cmNl
RmlsZSgpLCBGaWxlTW9kZS5PcGVuKTsNDQogCQkJCXN0cmVhbS5DbG9zZSgp
Ow0NCiAJCQkJciA9IG5ldyBSZXNvdXJjZVJlYWRlcihzdHJlYW0pOw0NCiAJ
CQkJRmFpbCgiU2hvdWxkIHRocm93IGV4Y2VwdGlvbiBvbiBjYW5ub3QgcmVh
ZCIpOw0NCkBAIC05Miw3ICsxMTgsNyBAQA0KIAkJcHVibGljIHZvaWQgVGVz
dFN0cmVhbSgpew0NCiAJCQlSZXNvdXJjZVJlYWRlciByID0gbnVsbDsNDQog
CQkJdHJ5IHsNDQotCQkJCVN0cmVhbSBzdHJlYW0gPSBuZXcgRmlsZVN0cmVh
bSAobV9SZXNvdXJjZUZpbGUsIEZpbGVNb2RlLk9wZW4pOw0NCisJCQkJU3Ry
ZWFtIHN0cmVhbSA9IG5ldyBGaWxlU3RyZWFtIChHZXRSZXNvdXJjZUZpbGUo
KSwgRmlsZU1vZGUuT3Blbik7DQ0KIAkJCQlyID0gbmV3IFJlc291cmNlUmVh
ZGVyKHN0cmVhbSk7DQ0KIAkJCX0gDQ0KIAkJCWNhdGNoew0NCkBAIC0xMDcs
MTEgKzEzMywxMSBAQA0KIA0NCiAJCXB1YmxpYyB2b2lkIFRlc3RDbG9zZSgp
IHsNDQogCQkJUmVzb3VyY2VSZWFkZXIgciA9IG51bGw7DQ0KLQkJCVN0cmVh
bSBzdHJlYW0gPSBuZXcgRmlsZVN0cmVhbSAobV9SZXNvdXJjZUZpbGUsIEZp
bGVNb2RlLk9wZW4pOw0NCisJCQlTdHJlYW0gc3RyZWFtID0gbmV3IEZpbGVT
dHJlYW0gKEdldFJlc291cmNlRmlsZSgpLCBGaWxlTW9kZS5PcGVuKTsNDQog
CQkJciA9IG5ldyBSZXNvdXJjZVJlYWRlcihzdHJlYW0pOw0NCiAJCQlyLkNs
b3NlKCk7DQ0KIAkJCXRyeSB7DQ0KLQkJCQlzdHJlYW0gPSBuZXcgRmlsZVN0
cmVhbSAobV9SZXNvdXJjZUZpbGUsIEZpbGVNb2RlLk9wZW4pOw0NCisJCQkJ
c3RyZWFtID0gbmV3IEZpbGVTdHJlYW0gKEdldFJlc291cmNlRmlsZSgpLCBG
aWxlTW9kZS5PcGVuKTsNDQogCQkJfSANDQogCQkJY2F0Y2h7DQ0KIAkJCQlG
YWlsKCJTaG91bGQgYmUgYWJsZSB0byBvcGVuIHRoZSBzdHJlYW0gYWdhaW4g
YWZ0ZXIgY2xvc2UiKTsNDQpAQCAtMTI1LDcgKzE1MSw3IEBADQogDQ0KIAkJ
cHVibGljIHZvaWQgVGVzdEVudW1lcmF0b3IoKXsNDQogCQkJUmVzb3VyY2VS
ZWFkZXIgcmVhZGVyID0gbnVsbDsNDQotCQkJU3RyZWFtIHN0cmVhbSA9IG5l
dyBGaWxlU3RyZWFtIChtX1Jlc291cmNlRmlsZSwgRmlsZU1vZGUuT3Blbik7
DQ0KKwkJCVN0cmVhbSBzdHJlYW0gPSBuZXcgRmlsZVN0cmVhbSAoR2V0UmVz
b3VyY2VGaWxlKCksIEZpbGVNb2RlLk9wZW4pOw0NCiAJCQlyZWFkZXIgPSBu
ZXcgUmVzb3VyY2VSZWFkZXIoc3RyZWFtKTsNDQogCQkJSURpY3Rpb25hcnlF
bnVtZXJhdG9yIGVuID0gcmVhZGVyLkdldEVudW1lcmF0b3IoKTsNDQogCQkJ
Ly8gR29lcyB0aHJvdWdoIHRoZSBlbnVtZXJhdG9yLCBwcmludGluZyBvdXQg
dGhlIGtleSBhbmQgdmFsdWUgcGFpcnMuDQ0K
--8323328-384888462-1013202924=:19299--