new-run-webkit-tests: merge os, version fields in test config
Created attachment 92037 [details]
See bug 60005 for a sample of what things will look like after this patch lands. Note that some variant of 60005 needs to land first (or at the same time) in order to update any lines that will use the obsolete 'win-xp', etc. macros. I could make the changes backwards-compatible, but that seems like more trouble than is worth it.
Committed r85880: <http://trac.webkit.org/changeset/85880>