This really seems like a boring set of fixes to our tests to make them more

independent of the underlying system. Let me know if any of these are too
aggressive.

llvm-svn: 119345