[PATCH v4 13/26] tools: post test-runner rewrite cleanup