swift234

[CMake] Fix validation testing for variant build.

I also broke the non-variant build. Oops.

Swift SVN r21118