This is partial revert of 70a8027c. The test apparently failed on win32 bots due to the way slashes in pathnames are handled. llvm-svn: 364705