Merge topic 'test-driver-local-var' into release-3.21

1e3d3c5284 TestDriver: Avoid declaring local variable after statement

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6276