Attempt again to fix buildbot failures: make expected output less specific

and compile with -mtriple to specify *-apple-darwin targets.

llvm-svn: 86081