Merge 81238 from mainline.

convert this to filecheck, hopefully it will fix PR4888.  If nothing
else it will make tests run faster and make 4888 easier to diagnose.

llvm-svn: 81286