This expands the number of modes from two to four, allowing one to
separate running the build from running tests.

This change is backwards-compatible. No existing behavior is changed.