LGTM https://codereview.appspot.com/175390043/diff/1/suite/tests/CMakeLists.txt File suite/tests/CMakeLists.txt (right): https://codereview.appspot.com/175390043/diff/1/suite/tests/CMakeLists.txt#ne... suite/tests/CMakeLists.txt:559: endif ("${test}" MATCHES "^pthread|startstop_FLAKY") I would suggest just endif() for easier maintenance, and also won't it match w/o the _FLAKY? Then we have fewer duplications of _FLAKY we have to change later.
Committed patchset #1 (id:1) manually as 3008 (presubmit successful).