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

Unified Diff: tools/gn/ninja_copy_target_writer_unittest.cc

Issue 51693002: GN: toolchain threading cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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') | tools/gn/ninja_group_target_writer.h » ('j') | 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 c31cbd27f8800606120bb608c8b4a183df0f3c33..5642d9d96dab57c8408b972593fe93f7a6b1c0da 100644
--- a/tools/gn/ninja_copy_target_writer_unittest.cc
+++ b/tools/gn/ninja_copy_target_writer_unittest.cc
@@ -27,14 +27,14 @@ TEST(NinjaCopyTargetWriter, Run) {
setup.settings()->set_target_os(Settings::LINUX);
std::ostringstream out;
- NinjaCopyTargetWriter writer(&target, out);
+ NinjaCopyTargetWriter writer(&target, setup.toolchain(), out);
writer.Run();
const char expected_linux[] =
- "build input1.out: tc_copy ../../foo/input1.txt\n"
- "build input2.out: tc_copy ../../foo/input2.txt\n"
+ "build input1.out: copy ../../foo/input1.txt\n"
+ "build input2.out: copy ../../foo/input2.txt\n"
"\n"
- "build obj/foo/bar.stamp: tc_stamp input1.out input2.out\n";
+ "build obj/foo/bar.stamp: stamp input1.out input2.out\n";
std::string out_str = out.str();
#if defined(OS_WIN)
std::replace(out_str.begin(), out_str.end(), '\\', '/');
@@ -47,16 +47,16 @@ TEST(NinjaCopyTargetWriter, Run) {
setup.settings()->set_target_os(Settings::WIN);
std::ostringstream out;
- NinjaCopyTargetWriter writer(&target, out);
+ NinjaCopyTargetWriter writer(&target, setup.toolchain(), out);
writer.Run();
// TODO(brettw) I think we'll need to worry about backslashes here
// depending if we're on actual Windows or Linux pretending to be Windows.
const char expected_win[] =
- "build input1.out: tc_copy ../../foo/input1.txt\n"
- "build input2.out: tc_copy ../../foo/input2.txt\n"
+ "build input1.out: copy ../../foo/input1.txt\n"
+ "build input2.out: copy ../../foo/input2.txt\n"
"\n"
- "build obj/foo/bar.stamp: tc_stamp input1.out input2.out\n";
+ "build obj/foo/bar.stamp: stamp input1.out input2.out\n";
std::string out_str = out.str();
#if defined(OS_WIN)
std::replace(out_str.begin(), out_str.end(), '\\', '/');
« no previous file with comments | « tools/gn/ninja_copy_target_writer.cc ('k') | tools/gn/ninja_group_target_writer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698