Make this test a bit stricter.

It now checks for the end of the line or the opening '{'.
While at it, remove empty comments.

llvm-svn: 225451