Merging r217104:
------------------------------------------------------------------------
r217104 | majnemer | 2014-09-03 16:20:58 -0700 (Wed, 03 Sep 2014) | 1 line

Adjust test to handle fallout from r217102.
------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_35@223703 91177308-0d34-0410-b5e6-96231b3b80d8