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