.isolated version 1.2 uses 'path_variables' instead of 'variables'.

scripts/slave/runisolatedtest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""A tool to run a chrome test executable directly, or in isolated mode."""
+"""A tool to run a chrome test executable directly, or in isolated mode.
+
+TODO(maruel): This script technically needs to die and be replaced by running
+all the tests always isolated even when not run on Swarming. This will take a
+while.
+"""
 
 import json
 import logging
 import optparse
 import os
 import re
 import subprocess
 import sys
 
 from slave import build_directory
@@ skipping 73 matching lines @@
 
 
 def sanitize_isolated_file(isolated_file, build_dir_basename):
   """Crack open .isolated file and fix embedded paths, if necessary.
 
   isolates assume that they can embed the build directory at build time and
   still used that directory at test time. With a builder/tester setup, this
   isn't generally true, so rewrite the paths in the isolated file. See
   http://crbug.com/311622 for details. This can go away once all bots using
   isolates are using ninja.
+
+  TODO(maruel): Do not forget to delete this code once the Windows incremental
+  builder is switched to ninja.
   """
   # See the isolates file format description at:
   # https://code.google.com/p/swarming/wiki/IsolatedDesign#.isolated_file_format
   with open(isolated_file) as f:
     isolated_data = json.load(f)
 
   # 1. check version
   if isolated_data['version'].split('.', 1)[0] != '1':

[Nico, 2013/12/13 20:00:06]

Should this be a whitelist of versions then after all? Looks like 1.x aren't
backwards-compatible

[M-A Ruel, 2013/12/13 20:02:25]

.isolated files *are* backward compatibles. It's because this script is hooking
into .isolated.state, which are explicitly an implementation details.

I don't think this buys us much in the 1.x versions, I think the next change
will be to 2.0 anyhow with the changes I plan to do.

     logging.error('Unexpected isolate version %s', isolated_data['version'])
     return 1
 
   # 2. fix command, print it
   for i in range(len(isolated_data['command'])):
     arg = isolated_data['command'][i]
     isolated_data['command'][i] = sanitize_build_dir(arg, build_dir_basename)
 
   # 3. fix files
   sanitized_files = {}
   for key, value in isolated_data['files'].iteritems():
     # a) fix key
     key = sanitize_build_dir(key, build_dir_basename)
     sanitized_files[key] = value
     # b) fix 'l' entry
     if 'l' in value:
       value['l'] = sanitize_build_dir(value['l'], build_dir_basename)
   isolated_data['files'] = sanitized_files
 
   # 4. Fix variables->PRODUCT_DIR if necessary (only present in the .state file)
-  variables = isolated_data.get('variables', {})
-  if 'PRODUCT_DIR' in variables:
-    variables['PRODUCT_DIR'] = sanitize_build_dir(variables['PRODUCT_DIR'],
-                                                  build_dir_basename)
+  for name in ('path_variables', 'variables'):
+    variables = isolated_data.get(name, {})
+    if 'PRODUCT_DIR' in variables:
+      variables['PRODUCT_DIR'] = sanitize_build_dir(variables['PRODUCT_DIR'],
+                                                    build_dir_basename)
 
   # TODO(thakis): fix 'includes' if necessary.
 
   with open(isolated_file, 'w') as f:
     json.dump(isolated_data, f)
 
 
 def run_test_isolated(isolate_script, test_exe, original_command):
   """Runs the test under isolate.py run.
 
@@ skipping 82 matching lines @@
       isolate_script = os.path.join(options.checkout_dir, 'src', 'tools',
                                     'swarm_client', 'isolate.py')
     return run_test_isolated(isolate_script, test_exe, original_command)
   else:
     logging.info('Running test normally')
     return run_command(original_command)
 
 
 if '__main__' == __name__:
   sys.exit(main(None))