Log Message: Applied a patch from Ryo HAYASAKA, provided in PR 35035, which fixes the check-portability test.