Add a test for the display of diagnostic options and categories. This

would have caught a bug I introduced during refactoring. Silly me
thinking this was all well tested already...

If any of this is already covered by other tests, let me know. I looked
around and didn't see any.

llvm-svn: 140522