Hopefully fixes test failures for msvc.

Looks like llvm::sys::path::filename() was canonicalizing my paths
before emitting them for FileCheck to stumble over.

Fix a style nit with r219460 while I'm at it.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@219464 91177308-0d34-0410-b5e6-96231b3b80d8