Remove the 'test' (gtest) knowledge and instead support the generic run_as sy...

pylib/gyp/generator/scons.py

 #!/usr/bin/python
 
 # Copyright (c) 2009 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import gyp
 import gyp.common
 import gyp.SCons as SCons
 import os.path
@@ skipping 512 matching lines @@
       # always returns the last element, whether a file or dir. Without this,
       # only the contents, not the directory itself, are copied (and nothing
       # might be copied if dest already exists, since scons thinks nothing needs
       # to be done).
       dest = os.path.join(destdir, os.path.basename(f.rstrip(os.sep)))
       f = FixPath(f, src_subdir_)
       dest = FixPath(dest, src_subdir_)
       fp.write(fmt % (repr(dest), repr(f)))
       fp.write('target_files.extend(_outputs)\n')
 
-  if spec.get('run_as') or int(spec.get('test', 0)):
-    run_as = spec.get('run_as', {
-        'action' : ['$TARGET_NAME', '--gtest_print_time'],
-        })
+  run_as = spec.get('run_as')
+  if run_as:
     action = run_as.get('action', [])
     working_directory = run_as.get('working_directory')
     if not working_directory:
       working_directory = gyp_dir
     else:
       if not os.path.isabs(working_directory):
         working_directory = os.path.normpath(os.path.join(gyp_dir,
                                                           working_directory))
     if run_as.get('environment'):
       for (key, val) in run_as.get('environment').iteritems():
@@ skipping 10 matching lines @@
   dependencies = spec.get('scons_dependencies', [])
   if dependencies:
     WriteList(fp, dependencies, preamble='dependencies = [\n    ',
                                 postamble='\n]\n')
     fp.write('env.Requires(target_files, dependencies)\n')
     fp.write('env.Requires(gyp_target, dependencies)\n')
     fp.write('for prerequisite in prerequisites:\n')
     fp.write('  env.Requires(prerequisite, dependencies)\n')
   fp.write('env.Requires(gyp_target, prerequisites)\n')
 
-  if spec.get('run_as', 0) or int(spec.get('test', 0)):
+  if run_as:
     fp.write(_run_as_template_suffix % {
       'target_name': target_name,
     })
 
   fp.write('Return("gyp_target")\n')
 
   fp.close()
 
 
 #############################################################################
@@ skipping 460 matching lines @@
       bf, target = gyp.common.ParseQualifiedTarget(t)[:2]
       target_filename = TargetFilename(target, bf, options.suffix)
       tpath = gyp.common.RelativePath(target_filename, output_dir)
       sconscript_files[target] = tpath
 
     output_filename = output_path(output_filename)
     if sconscript_files:
       GenerateSConscriptWrapper(build_file, data[build_file], basename,
                                 output_filename, sconscript_files,
                                 default_configuration)