Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Unified Diff: tools/gn/ninja_copy_target_writer_unittest.cc

Issue 418573002: Don't add implicit deps to copy commands in GN. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/gn/ninja_copy_target_writer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/ninja_copy_target_writer_unittest.cc
diff --git a/tools/gn/ninja_copy_target_writer_unittest.cc b/tools/gn/ninja_copy_target_writer_unittest.cc
index e9f24371ba27db5c35399d25c7b6ff17076b4c04..2ab0a8cb0c877cf870fff4921521e0623e419d18 100644
--- a/tools/gn/ninja_copy_target_writer_unittest.cc
+++ b/tools/gn/ninja_copy_target_writer_unittest.cc
@@ -37,7 +37,7 @@ TEST(NinjaCopyTargetWriter, Run) {
EXPECT_EQ(expected_linux, out_str);
}
-// Tests a single file with no output pattern and a toolchain dependency.
+// Tests a single file with no output pattern.
TEST(NinjaCopyTargetWriter, ToolchainDeps) {
TestWithScope setup;
setup.settings()->set_target_os(Settings::LINUX);
@@ -45,15 +45,6 @@ TEST(NinjaCopyTargetWriter, ToolchainDeps) {
Target target(setup.settings(), Label(SourceDir("//foo/"), "bar"));
target.set_output_type(Target::COPY_FILES);
- // Toolchain dependency. Here we make a target in the same toolchain for
- // simplicity, but in real life (using the Builder) this would be rejected
- // because it would be a circular dependency (the target depends on its
- // toolchain, and the toolchain depends on this target).
- Target toolchain_dep_target(setup.settings(),
- Label(SourceDir("//foo/"), "setup"));
- toolchain_dep_target.set_output_type(Target::ACTION);
- setup.toolchain()->deps().push_back(LabelTargetPair(&toolchain_dep_target));
-
target.sources().push_back(SourceFile("//foo/input1.txt"));
target.action_values().outputs().push_back("//out/Debug/output.out");
@@ -63,9 +54,7 @@ TEST(NinjaCopyTargetWriter, ToolchainDeps) {
writer.Run();
const char expected_linux[] =
- "build obj/foo/bar.inputdeps.stamp: stamp obj/foo/setup.stamp\n"
- "build output.out: copy ../../foo/input1.txt | "
- "obj/foo/bar.inputdeps.stamp\n"
+ "build output.out: copy ../../foo/input1.txt\n"
"\n"
"build obj/foo/bar.stamp: stamp output.out\n";
std::string out_str = out.str();
« no previous file with comments | « tools/gn/ninja_copy_target_writer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698