Fix Windows refleak timeout

* Set the test_timeout on Windows64RefleakBuild
* WindowsBuild now uses regrtest --timeout=xxx even if the
  test_timeout class variable is not set: use the default timeout in
  that case

master/master.cfg

@@ -316,11 +316,11 @@ class WindowsBuild(factory.BuildFactory):
         self.addStep(Compile(command=build_command))
         # timeout is a bit more than the regrtest default timeout
         if self.test_timeout:
-            if branch != '2.7':
-                test_command += ['--timeout', self.test_timeout - (5 * 60)]
             timeout = self.test_timeout
         else:
             timeout = TEST_TIMEOUT
+        if branch != '2.7':
+            test_command += ['--timeout', timeout - (5 * 60)]
         self.addStep(Test(command=test_command, timeout=timeout))
         self.addStep(Clean(command=clean_command))
 
@@ -356,6 +356,10 @@ class Windows64Build(WindowsBuild):
 class Windows64RefleakBuild(Windows64Build):
     buildersuffix = '.refleak'
     testFlags = ['-x64', '-j2', '-R', '3:3:refleaks.log', '-u-cpu']
+    # -R 3:3 is supposed to only require timeout x 6, but in practice,
+    # it's much more slower. Use timeout x 10 to prevent timeout
+    # caused by --huntrleaks.
+    test_timeout = TEST_TIMEOUT * 10
 
 
 class Windows64ReleaseBuild(Windows64Build):