apply vdanjean's pull request 'rewrite no-rpath test'