Merging r220401:
Merging r220401:

------------------------------------------------------------------------
r220401 | mail | 2014-10-22 14:18:54 -0400 (Wed, 22 Oct 2014) | 6 lines

test: Make this test runnable in directories with @ in their names

Jenkins likes to use directories with names involving the '@'
character, which breaks the sed expression in this test. Switch to use
'|' on the assumption that it's less likely to show up in a path.

------------------------------------------------------------------------

git-svn-id: 1a981f132218c5d985e5b5a896e7a8b8201781d6@221390 91177308-0d34-0410-b5e6-96231b3b80d8

chubbymaggie/asap,chubbymaggie/asap,chubbymaggie/asap,chubbymaggie/asap,chubbymaggie/asap,chubbymaggie/asap