Associate xctest files with corresponding xctest targets.

tools/gn/xcode_object.cc

 // Copyright 2016 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.
 
 #include "tools/gn/xcode_object.h"
 
 #include <iomanip>
 #include <sstream>
 #include <utility>
 
@@ skipping 469 matching lines @@
   children_.push_back(std::move(child));
   return children_.back().get();
 }
 
 PBXFileReference* PBXGroup::AddSourceFile(const std::string& navigator_path,
                                           const std::string& source_path) {
   DCHECK(!navigator_path.empty());
   DCHECK(!source_path.empty());
   std::string::size_type sep = navigator_path.find("/");
   if (sep == std::string::npos) {
+    // Prevent same file reference being created and added multiple times.
+    for (const auto& child : children_) {
+      if (child->Class() != PBXFileReferenceClass)
+        continue;
+
+      PBXFileReference* child_as_file_reference =
+          static_cast<PBXFileReference*>(child.get());
+      if (child_as_file_reference->Name() == navigator_path &&
+          child_as_file_reference->path() == source_path) {
+        return child_as_file_reference;
+      }
+    }
+
     children_.push_back(base::MakeUnique<PBXFileReference>(
         navigator_path, source_path, std::string()));
     return static_cast<PBXFileReference*>(children_.back().get());
   }
 
   PBXGroup* group = nullptr;
   base::StringPiece component(navigator_path.data(), sep);
   for (const auto& child : children_) {
     if (child->Class() != PBXGroupClass)
       continue;
@@ skipping 168 matching lines @@
       products_->AddChild(base::MakeUnique<PBXFileReference>(
           std::string(), name_, "compiled.mach-o.executable")));
 
   const char product_type[] = "com.apple.product-type.tool";
   targets_.push_back(base::MakeUnique<PBXNativeTarget>(
       name_, std::string(), config_name_, attributes, product_type, name_,
       product_reference));
   target_for_indexing_ = static_cast<PBXNativeTarget*>(targets_.back().get());
 }
 
-void PBXProject::AddNativeTarget(const std::string& name,
-                                 const std::string& type,
-                                 const std::string& output_name,
-                                 const std::string& output_type,
-                                 const std::string& shell_script,
-                                 const PBXAttributes& extra_attributes) {
+PBXNativeTarget* PBXProject::AddNativeTarget(
+    const std::string& name,
+    const std::string& type,
+    const std::string& output_name,
+    const std::string& output_type,
+    const std::string& shell_script,
+    const PBXAttributes& extra_attributes) {
   base::StringPiece ext = FindExtension(&output_name);
   PBXFileReference* product = static_cast<PBXFileReference*>(
       products_->AddChild(base::MakeUnique<PBXFileReference>(
           std::string(), output_name,
           type.empty() ? GetSourceType(ext) : type)));
 
   size_t ext_offset = FindExtensionOffset(output_name);
   std::string product_name = ext_offset != std::string::npos
                                  ? output_name.substr(0, ext_offset - 1)
                                  : output_name;
 
   PBXAttributes attributes = extra_attributes;
   attributes["CODE_SIGNING_REQUIRED"] = "NO";
   attributes["CONFIGURATION_BUILD_DIR"] = ".";
   attributes["PRODUCT_NAME"] = product_name;
 
   targets_.push_back(base::MakeUnique<PBXNativeTarget>(
       name, shell_script, config_name_, attributes, output_type, product_name,
       product));
+  return static_cast<PBXNativeTarget*>(targets_.back().get());
 }
 
 void PBXProject::SetProjectDirPath(const std::string& project_dir_path) {
   DCHECK(!project_dir_path.empty());
   project_dir_path_.assign(project_dir_path);
 }
 
 void PBXProject::SetProjectRoot(const std::string& project_root) {
   DCHECK(!project_root.empty());
   project_root_.assign(project_root);
@@ skipping 177 matching lines @@
   const std::string indent_str(indent, '\t');
   const IndentRules rules = {false, indent + 1};
   out << indent_str << Reference() << " = {\n";
   PrintProperty(out, rules, "isa", ToString(Class()));
   PrintProperty(out, rules, "buildConfigurations", configurations_);
   PrintProperty(out, rules, "defaultConfigurationIsVisible", 1u);
   PrintProperty(out, rules, "defaultConfigurationName",
                 configurations_[0]->Name());
   out << indent_str << "};\n";
 }