[PATCH 0/4] MR3681: include: Deduplicate WineTest helpers. 1/2