Add variables support to trace_test_cases.py, removing the last use of --product-dir.

tools/isolate/isolate.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.
 
 """Does one of the following depending on the --mode argument:
   check     Verifies all the inputs exist, touches the file specified with
             --result and exits.
   hashtable Puts a manifest file and hard links each of the inputs into the
             output directory.
@@ skipping 231 matching lines @@
   return deepest_root
 
 
 def process_variables(variables, relative_base_dir, error):
   """Processes path variables as a special case and returns a copy of the dict.
 
   For each 'path' varaible: first normalizes it, verifies it exists, converts it
   to an absolute path, then sets it as relative to relative_base_dir.
   """
   variables = variables.copy()
-  for i in ('DEPTH', 'PRODUCT_DIR'):
+  for i in isolate_common.PATH_VARIABLES:
     if i not in variables:
       continue
     variable = os.path.normpath(variables[i])
     if not os.path.isdir(variable):
       error('%s=%s is not a directory' % (i, variable))
     # Variables could contain / or \ on windows. Always normalize to
     # os.path.sep.
     variable = os.path.abspath(variable.replace('/', os.path.sep))
     # All variables are relative to the .isolate file.
     variables[i] = os.path.relpath(variable, relative_base_dir)
@@ skipping 296 matching lines @@
   finally:
     run_test_from_archive.rmtree(outdir)
 
 
 def MODEread(_outdir, state):
   """Reads the trace file generated with --mode=trace."""
   api = trace_inputs.get_api()
   logfile = state.result_file + '.log'
   if not os.path.isfile(logfile):
     return 1
-  product_dir = None
-  if state.resultdir and state.root_dir:
-    # Defaults to none if both are the same directory.
-    try:
-      product_dir = os.path.relpath(state.resultdir, state.root_dir) or None
-    except ValueError:
-      # This happens on Windows if state.resultdir is one drive, let's say
-      # 'C:\' and state.root_dir on another one like 'D:\'.
-      product_dir = None
   try:
     results = trace_inputs.load_trace(
         logfile, state.root_dir, api, isolate_common.default_blacklist)
-    simplified = trace_inputs.extract_directories(state.root_dir, results.files)
-    variables = isolate_common.generate_dict(
-            (f.path for f in simplified),
-            state.result.relative_cwd,
-            product_dir)
-    # Outputs in a way that is easy to merge with merge_isolate.py.
-    value = {
-      'conditions': [
-        ['OS=="%s"' % isolate_common.get_flavor(), {
-          'variables': variables,
-        }],
-      ],
-    }
+    value = isolate_common.generate_isolate(
+        results.existent,
+        state.root_dir,
+        state.saved_state.variables,
+        state.result.relative_cwd)
     isolate_common.pretty_print(value, sys.stdout)
     return 0
   except trace_inputs.TracingFailure, e:
     print >> sys.stderr, (
         '\nReading traces failed for: %s' % ' '.join(state.result.command))
     print >> sys.stderr, str(e)
     return 1
 
 
 def MODEtrace(_outdir, state):
@@ skipping 176 matching lines @@
       result_file,
       input_file,
       options.mode,
       variables,
       out_dir,
       parser.error)
 
 
 if __name__ == '__main__':
   sys.exit(main())