fix FS#41509, fix make test

git-svn-id: file:///srv/repos/svn-community/svn@117095 9fca08f4-af9d-4005-b8df-a31f2cc04f65