r18026: patch from Brad allowing the windows testing to be configured