Improve GN handling of directory templates.

tools/gn/ninja_action_target_writer_unittest.cc

 // Copyright (c) 2013 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 <sstream>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "tools/gn/file_template.h"
 #include "tools/gn/ninja_action_target_writer.h"
 #include "tools/gn/test_with_scope.h"
 
 TEST(NinjaActionTargetWriter, WriteOutputFilesForBuildLine) {
   TestWithScope setup;
   setup.build_settings()->SetBuildDir(SourceDir("//out/Debug/"));
   Target target(setup.settings(), Label(SourceDir("//foo/"), "bar"));
 
   target.action_values().outputs().push_back(
-      SourceFile("//out/Debug/gen/a b{{source_name_part}}.h"));
+      "//out/Debug/gen/a b{{source_name_part}}.h");
   target.action_values().outputs().push_back(
-      SourceFile("//out/Debug/gen/{{source_name_part}}.cc"));
+      "//out/Debug/gen/{{source_name_part}}.cc");
 
   std::ostringstream out;
   NinjaActionTargetWriter writer(&target, setup.toolchain(), out);
 
-  FileTemplate output_template = writer.GetOutputTemplate();
+  FileTemplate output_template = FileTemplate::GetForTargetOutputs(&target);
 
   SourceFile source("//foo/bar.in");
   std::vector<OutputFile> output_files;
   writer.WriteOutputFilesForBuildLine(output_template, source, &output_files);
 
   EXPECT_EQ(" gen/a$ bbar.h gen/bar.cc", out.str());
 }
 
 TEST(NinjaActionTargetWriter, WriteArgsSubstitutions) {
   TestWithScope setup;
   setup.build_settings()->SetBuildDir(SourceDir("//out/Debug/"));
   Target target(setup.settings(), Label(SourceDir("//foo/"), "bar"));
 
   std::ostringstream out;
   NinjaActionTargetWriter writer(&target, setup.toolchain(), out);
 
   std::vector<std::string> args;
   args.push_back("-i");
   args.push_back("{{source}}");
   args.push_back("--out=foo bar{{source_name_part}}.o");
-  FileTemplate args_template(setup.settings(), args);
+  FileTemplate args_template(setup.settings(), args,
+                             FileTemplate::OUTPUT_RELATIVE,
+                             setup.settings()->build_settings()->build_dir());
 
   writer.WriteArgsSubstitutions(SourceFile("//foo/b ar.in"), args_template);
 #if defined(OS_WIN)
   EXPECT_EQ("  source = \"../../foo/b$ ar.in\"\n"
             "  source_name_part = \"b$ ar\"\n",
             out.str());
 #else
   EXPECT_EQ("  source = ../../foo/b\\$ ar.in\n"
             "  source_name_part = b\\$ ar\n",
             out.str());
 #endif
 }
 
 // Makes sure that we write sources as input dependencies for actions with
 // both sources and inputs (ACTION_FOREACH treats the sources differently).
 TEST(NinjaActionTargetWriter, ActionWithSources) {
   TestWithScope setup;
   setup.build_settings()->SetBuildDir(SourceDir("//out/Debug/"));
   Target target(setup.settings(), Label(SourceDir("//foo/"), "bar"));
   target.set_output_type(Target::ACTION);
 
   target.action_values().set_script(SourceFile("//foo/script.py"));
 
   target.sources().push_back(SourceFile("//foo/source.txt"));
   target.inputs().push_back(SourceFile("//foo/included.txt"));
 
-  target.action_values().outputs().push_back(
-      SourceFile("//out/Debug/foo.out"));
+  target.action_values().outputs().push_back("//out/Debug/foo.out");
 
   // Posix.
   {
     setup.settings()->set_target_os(Settings::LINUX);
     setup.build_settings()->set_python_path(base::FilePath(FILE_PATH_LITERAL(
         "/usr/bin/python")));
 
     std::ostringstream out;
     NinjaActionTargetWriter writer(&target, setup.toolchain(), out);
     writer.Run();
@@ skipping 63 matching lines @@
   target.sources().push_back(SourceFile("//foo/input2.txt"));
 
   target.action_values().set_script(SourceFile("//foo/script.py"));
 
   target.action_values().args().push_back("-i");
   target.action_values().args().push_back("{{source}}");
   target.action_values().args().push_back(
       "--out=foo bar{{source_name_part}}.o");
 
   target.action_values().outputs().push_back(
-      SourceFile("//out/Debug/{{source_name_part}}.out"));
+      "//out/Debug/{{source_name_part}}.out");
 
   target.inputs().push_back(SourceFile("//foo/included.txt"));
 
   // Posix.
   {
     setup.settings()->set_target_os(Settings::LINUX);
     setup.build_settings()->set_python_path(base::FilePath(FILE_PATH_LITERAL(
         "/usr/bin/python")));
 
     std::ostringstream out;
@@ skipping 88 matching lines @@
   target.action_values().set_script(SourceFile("//foo/script.py"));
   target.action_values().set_depfile(
       SourceFile("//out/Debug/gen/{{source_name_part}}.d"));
 
   target.action_values().args().push_back("-i");
   target.action_values().args().push_back("{{source}}");
   target.action_values().args().push_back(
       "--out=foo bar{{source_name_part}}.o");
 
   target.action_values().outputs().push_back(
-      SourceFile("//out/Debug/{{source_name_part}}.out"));
+      "//out/Debug/{{source_name_part}}.out");
 
   target.inputs().push_back(SourceFile("//foo/included.txt"));
 
   // Posix.
   {
     setup.settings()->set_target_os(Settings::LINUX);
     setup.build_settings()->set_python_path(base::FilePath(FILE_PATH_LITERAL(
         "/usr/bin/python")));
 
     std::ostringstream out;
@@ skipping 64 matching lines @@
             " | obj/foo/bar.inputdeps.stamp\n"
         "  unique_name = 1\n"
         "  source = ../../foo/input2.txt\n"
         "  source_name_part = input2\n"
         "  depfile = gen/input2.d\n"
         "\n"
         "build obj/foo/bar.stamp: stamp input1.out input2.out\n";
     EXPECT_EQ(expected_win, out.str());
   }
 }