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

Unified Diff: tools/gn/ninja_action_target_writer_unittest.cc

Issue 321323004: Add yasm to the GN build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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_action_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_action_target_writer_unittest.cc
diff --git a/tools/gn/ninja_action_target_writer_unittest.cc b/tools/gn/ninja_action_target_writer_unittest.cc
index 9c6f2f1c3b7cdd42a00e6e9cc5870e218075f469..fefc26364a43c4d317655a295de2953326af2b94 100644
--- a/tools/gn/ninja_action_target_writer_unittest.cc
+++ b/tools/gn/ninja_action_target_writer_unittest.cc
@@ -32,30 +32,6 @@ TEST(NinjaActionTargetWriter, WriteOutputFilesForBuildLine) {
EXPECT_EQ(" gen/a$ bbar.h gen/bar.cc", out.str());
}
-TEST(NinjaActionTargetWriter, WriteOutputFilesForBuildLineWithDepfile) {
- TestWithScope setup;
- setup.build_settings()->SetBuildDir(SourceDir("//out/Debug/"));
- Target target(setup.settings(), Label(SourceDir("//foo/"), "bar"));
-
- target.action_values().set_depfile(
- SourceFile("//out/Debug/gen/{{source_name_part}}.d"));
- target.action_values().outputs().push_back(
- SourceFile("//out/Debug/gen/{{source_name_part}}.h"));
- target.action_values().outputs().push_back(
- SourceFile("//out/Debug/gen/{{source_name_part}}.cc"));
-
- std::ostringstream out;
- NinjaActionTargetWriter writer(&target, setup.toolchain(), out);
-
- FileTemplate output_template = writer.GetOutputTemplate();
-
- SourceFile source("//foo/bar.in");
- std::vector<OutputFile> output_files;
- writer.WriteOutputFilesForBuildLine(output_template, source, &output_files);
-
- EXPECT_EQ(" gen/bar.d gen/bar.h gen/bar.cc", out.str());
-}
-
TEST(NinjaActionTargetWriter, WriteArgsSubstitutions) {
TestWithScope setup;
setup.build_settings()->SetBuildDir(SourceDir("//out/Debug/"));
@@ -317,12 +293,12 @@ TEST(NinjaActionTargetWriter, ForEachWithDepfile) {
"build obj/foo/bar.inputdeps.stamp: stamp ../../foo/script.py "
"../../foo/included.txt\n"
"\n"
- "build gen/input1.d input1.out: __foo_bar___rule ../../foo/input1.txt"
+ "build input1.out: __foo_bar___rule ../../foo/input1.txt"
" | obj/foo/bar.inputdeps.stamp\n"
" source = ../../foo/input1.txt\n"
" source_name_part = input1\n"
" depfile = gen/input1.d\n"
- "build gen/input2.d input2.out: __foo_bar___rule ../../foo/input2.txt"
+ "build input2.out: __foo_bar___rule ../../foo/input2.txt"
" | obj/foo/bar.inputdeps.stamp\n"
" source = ../../foo/input2.txt\n"
" source_name_part = input2\n"
@@ -358,13 +334,13 @@ TEST(NinjaActionTargetWriter, ForEachWithDepfile) {
"build obj/foo/bar.inputdeps.stamp: stamp ../../foo/script.py "
"../../foo/included.txt\n"
"\n"
- "build gen/input1.d input1.out: __foo_bar___rule ../../foo/input1.txt"
+ "build input1.out: __foo_bar___rule ../../foo/input1.txt"
" | obj/foo/bar.inputdeps.stamp\n"
" unique_name = 0\n"
" source = ../../foo/input1.txt\n"
" source_name_part = input1\n"
" depfile = gen/input1.d\n"
- "build gen/input2.d input2.out: __foo_bar___rule ../../foo/input2.txt"
+ "build input2.out: __foo_bar___rule ../../foo/input2.txt"
" | obj/foo/bar.inputdeps.stamp\n"
" unique_name = 1\n"
" source = ../../foo/input2.txt\n"
« no previous file with comments | « tools/gn/ninja_action_target_writer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698