llvm-svn: 333526
Not strictly necessary, but makes the test more robust in case we end up changing the defaults. <rdar://problem/40622096> llvm-svn: 333466
While I'm here, delete some dead code. <rdar://problem/40622096> llvm-svn: 333465