Allow directories for GN data lists.

tools/gn/runtime_deps_unittest.cc

 // Copyright 2015 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 <algorithm>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "tools/gn/runtime_deps.h"
 #include "tools/gn/target.h"
 #include "tools/gn/test_with_scope.h"
@@ skipping 31 matching lines @@
 TEST(RuntimeDeps, Libs) {
   TestWithScope setup;
   Err err;
 
   // Dependency hierarchy: main(exe) -> stat
   //                                 -> shared
   //                                 -> set
 
   Target stat(setup.settings(), Label(SourceDir("//"), "stat"));
   InitTargetWithType(setup, &stat, Target::STATIC_LIBRARY);
-  stat.data().push_back(SourceFile("//stat.dat"));
+  stat.data().push_back("//stat.dat");
   ASSERT_TRUE(stat.OnResolved(&err));
 
   Target shared(setup.settings(), Label(SourceDir("//"), "shared"));
   InitTargetWithType(setup, &shared, Target::SHARED_LIBRARY);
-  shared.data().push_back(SourceFile("//shared.dat"));
+  shared.data().push_back("//shared.dat");
   ASSERT_TRUE(shared.OnResolved(&err));
 
   Target set(setup.settings(), Label(SourceDir("//"), "set"));
   InitTargetWithType(setup, &set, Target::SOURCE_SET);
-  set.data().push_back(SourceFile("//set.dat"));
+  set.data().push_back("//set.dat");
   ASSERT_TRUE(set.OnResolved(&err));
 
   Target main(setup.settings(), Label(SourceDir("//"), "main"));
   InitTargetWithType(setup, &main, Target::EXECUTABLE);
   main.private_deps().push_back(LabelTargetPair(&stat));
   main.private_deps().push_back(LabelTargetPair(&shared));
   main.private_deps().push_back(LabelTargetPair(&set));
-  main.data().push_back(SourceFile("//main.dat"));
+  main.data().push_back("//main.dat");
   ASSERT_TRUE(main.OnResolved(&err));
 
   std::vector<std::pair<OutputFile, const Target*>> result =
       ComputeRuntimeDeps(&main);
 
   // The result should have deps of main, all 4 dat files, and libshared.so
   ASSERT_EQ(6u, result.size()) << GetVectorDescription(result);
 
   // The first one should always be the main exe.
   EXPECT_TRUE(MakePair("./main", &main) == result[0]);
@@ skipping 24 matching lines @@
   TestWithScope setup;
   Err err;
 
   // Dependency hierarchy: main(exe) -> datadep(exe) -> final_in(source set)
   //                                 -> dep(exe) -> final_out(source set)
   // The final_in/out targets each have data files. final_in's should be
   // included, final_out's should not be.
 
   Target final_in(setup.settings(), Label(SourceDir("//"), "final_in"));
   InitTargetWithType(setup, &final_in, Target::SOURCE_SET);
-  final_in.data().push_back(SourceFile("//final_in.dat"));
+  final_in.data().push_back("//final_in.dat");
   ASSERT_TRUE(final_in.OnResolved(&err));
 
   Target datadep(setup.settings(), Label(SourceDir("//"), "datadep"));
   InitTargetWithType(setup, &datadep, Target::EXECUTABLE);
   datadep.private_deps().push_back(LabelTargetPair(&final_in));
   ASSERT_TRUE(datadep.OnResolved(&err));
 
   Target final_out(setup.settings(), Label(SourceDir("//"), "final_out"));
   InitTargetWithType(setup, &final_out, Target::SOURCE_SET);
-  final_out.data().push_back(SourceFile("//final_out.dat"));
+  final_out.data().push_back("//final_out.dat");
   ASSERT_TRUE(final_out.OnResolved(&err));
 
   Target dep(setup.settings(), Label(SourceDir("//"), "dep"));
   InitTargetWithType(setup, &dep, Target::EXECUTABLE);
   dep.private_deps().push_back(LabelTargetPair(&final_out));
   ASSERT_TRUE(dep.OnResolved(&err));
 
   Target main(setup.settings(), Label(SourceDir("//"), "main"));
   InitTargetWithType(setup, &main, Target::EXECUTABLE);
   main.private_deps().push_back(LabelTargetPair(&dep));
@@ skipping 25 matching lines @@
   TestWithScope setup;
   Err err;
 
   // Dependency hierarchy: main(exe) -> datadep (action)
   //                                 -> datadep_copy (copy)
   //                                 -> dep (action)
   //                                 -> dep_copy (copy)
 
   Target datadep(setup.settings(), Label(SourceDir("//"), "datadep"));
   InitTargetWithType(setup, &datadep, Target::ACTION);
-  datadep.data().push_back(SourceFile("//datadep.data"));
+  datadep.data().push_back("//datadep.data");
   datadep.action_values().outputs() =
       SubstitutionList::MakeForTest("//datadep.output");
   ASSERT_TRUE(datadep.OnResolved(&err));
 
   Target datadep_copy(setup.settings(), Label(SourceDir("//"), "datadep_copy"));
   InitTargetWithType(setup, &datadep_copy, Target::COPY_FILES);
   datadep_copy.sources().push_back(SourceFile("//input"));
-  datadep_copy.data().push_back(SourceFile("//datadep_copy.data"));
+  datadep_copy.data().push_back("//datadep_copy.data");
   datadep_copy.action_values().outputs() =
       SubstitutionList::MakeForTest("//datadep_copy.output");
   ASSERT_TRUE(datadep_copy.OnResolved(&err));
 
   Target dep(setup.settings(), Label(SourceDir("//"), "dep"));
   InitTargetWithType(setup, &dep, Target::ACTION);
-  dep.data().push_back(SourceFile("//dep.data"));
+  dep.data().push_back("//dep.data");
   dep.action_values().outputs() =
       SubstitutionList::MakeForTest("//dep.output");
   ASSERT_TRUE(dep.OnResolved(&err));
 
   Target dep_copy(setup.settings(), Label(SourceDir("//"), "dep_copy"));
   InitTargetWithType(setup, &dep_copy, Target::COPY_FILES);
   dep_copy.sources().push_back(SourceFile("//input"));
-  dep_copy.data().push_back(SourceFile("//dep_copy.data"));
+  dep_copy.data().push_back("//dep_copy.data");

[scottmg, 2015/06/03 22:11:30]

should there be a test for directories here since they're rebased differently
depending on last char?

   dep_copy.action_values().outputs() =
       SubstitutionList::MakeForTest("//dep_copy.output");
   ASSERT_TRUE(dep_copy.OnResolved(&err));
 
   Target main(setup.settings(), Label(SourceDir("//"), "main"));
   InitTargetWithType(setup, &main, Target::EXECUTABLE);
   main.private_deps().push_back(LabelTargetPair(&dep));
   main.private_deps().push_back(LabelTargetPair(&dep_copy));
   main.data_deps().push_back(LabelTargetPair(&datadep));
   main.data_deps().push_back(LabelTargetPair(&datadep_copy));
@@ skipping 28 matching lines @@
   EXPECT_TRUE(std::find(result.begin(), result.end(),
                         MakePair("../../dep_copy.data", &dep_copy)) !=
               result.end()) << GetVectorDescription(result);
 
   // Explicitly asking for the runtime deps of an action target only includes
   // the data and not all outputs.
   result = ComputeRuntimeDeps(&dep);
   ASSERT_EQ(1u, result.size());
   EXPECT_TRUE(MakePair("../../dep.data", &dep) == result[0]);
 }