Changes analyzer to include test_targets in compile_targets

pylib/gyp/generator/analyzer.py

 # Copyright (c) 2014 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.
 
 """
 This script is intended for use as a GYP_GENERATOR. It takes as input (by way of
 the generator flag config_path) the path of a json file that dictates the files
 and targets to search for. The following keys are supported:
 files: list of paths (relative) of the files to search for.
 test_targets: unqualified target names to search for. Any target in this list
 that depends upon a file in |files| is output regardless of the type of target
 or chain of dependencies.
 additional_compile_targets: Unqualified targets to search for in addition to
 test_targets. Targets in the combined list that depend upon a file in |files|
 are not necessarily output. For example, if the target is of type none then the
 target is not output (but one of the descendants of the target will be).
 
 The following is output:
 error: only supplied if there is an error.
 compile_targets: minimal set of targets that directly or indirectly (for
   targets of type none) depend on the files in |files| and is one of the
   supplied targets or a target that one of the supplied targets depends on.
-  The expectation is this set of targets is passed into a build step.
+  The expectation is this set of targets is passed into a build step. This list
+  always contains the output of test_targets as well.
 test_targets: set of targets from the supplied |test_targets| that either
   directly or indirectly depend upon a file in |files|. This list if useful
   if additional processing needs to be done for certain targets after the
   build, such as running tests.
 status: outputs one of three values: none of the supplied files were found,
   one of the include files changed so that it should be assumed everything
   changed (in this case test_targets and compile_targets are not output) or at
   least one file was found.
 invalid_targets: list of supplied targets that were not found.
 
@@ skipping 791 matching lines @@
         result_dict['invalid_targets'] = calculator.invalid_targets
       _WriteOutput(params, **result_dict)
       return
 
     test_target_names = calculator.find_matching_test_target_names()
     compile_target_names = calculator.find_matching_compile_target_names()
     found_at_least_one_target = compile_target_names or test_target_names
     result_dict = { 'test_targets': test_target_names,
                     'status': found_dependency_string if
                         found_at_least_one_target else no_dependency_string,
-                    'compile_targets': compile_target_names}
+                    'compile_targets': list(
+                        set(compile_target_names) |
+                        set(test_target_names)) }
     if calculator.invalid_targets:
       result_dict['invalid_targets'] = calculator.invalid_targets
     _WriteOutput(params, **result_dict)
 
   except Exception as e:
     _WriteOutput(params, error=str(e))