win x86: Grab bag of restructuring to get tests working on x86-on-x86

util/util_test.gyp

Index: util/util_test.gyp
diff --git a/util/util_test.gyp b/util/util_test.gyp
index 98879eb630e27ce0ddc1ac105d0b01ed6c45f3f9..88bbf271acf2f71116b61020c61aadd091e79a85 100644
--- a/util/util_test.gyp
+++ b/util/util_test.gyp
@@ -126,6 +126,7 @@
                 '/BASE:0x78000000',
                 '/FIXED',
               ],
+              'MinimumRequiredVersion': '5.02',  # Server 2003.

[Mark Mentovai, 2015/09/16 02:57:20]

Is this a good thing to set on other targets? Do we need to set something on the
32-bit target below?

[scottmg, 2015/09/16 18:05:06]

It's a bit tricky, but build/common.gypi sets most cases correctly, that is:
5.01 for XP on x86, and 5.02 for Server 2003 on x64, based on target_arch.

For this one (x64-during-x86-build) it would be set to 5.01, but that's invalid
for x64 links, so we need to override to 5.02.

Below, when it's x86-during-x86 it'll be set to 5.01 as desired based on
target_arch.

But when it's x86-during-x64-build, it'll be set to 5.02 so that binary won't
run on XP -- but that's OK because neither will the rest of the x64 build that's
targeted a minimum of Server 2003.

               'TargetMachine': '17',  # x64.
             },
           },