[PATCH 0/5] MR3691: include: Deduplicate WineTest helpers. (2/2)