swift234

[test] Deduplicate shared logic between OS X and the simulators.

These might need to diverge at some point, but for now it's better to
have fewer places to change things. No intended behavior change.