Fix -Wstring-plus-int errors in ninja_action_target_writer_unittest Change-Id: I04d6372cc5e7a2247f5798e5e6ee0105d1fb3994 Reviewed-on: https://gn-review.googlesource.com/c/gn/+/4501 Reviewed-by: Scott Graham <scottmg@chromium.org> Commit-Queue: Julie Hockett <juliehockett@google.com>
diff --git a/tools/gn/ninja_action_target_writer_unittest.cc b/tools/gn/ninja_action_target_writer_unittest.cc index 19f81ae..90173b3 100644 --- a/tools/gn/ninja_action_target_writer_unittest.cc +++ b/tools/gn/ninja_action_target_writer_unittest.cc
@@ -60,8 +60,7 @@ NinjaActionTargetWriter writer(&target, out); writer.Run(); - const char* expected = 1 /* skip initial newline */ + R"( -rule __foo_bar___rule + const char* expected = R"(rule __foo_bar___rule command = /usr/bin/python ../../foo/script.py description = ACTION //foo:bar() restat = 1 @@ -70,7 +69,7 @@ build obj/foo/bar.stamp: stamp foo.out )"; - EXPECT_EQ(expected, out.str()); + EXPECT_EQ(expected, out.str()) << expected << "--" << out.str(); } // Tests an action with no sources and pool @@ -105,8 +104,7 @@ // The console pool's name must be mapped exactly to the string "console" // which is a special pre-defined pool name in ninja. - const char* expected = 1 /* skip initial newline */ + R"( -rule __foo_bar___rule + const char* expected = R"(rule __foo_bar___rule command = /usr/bin/python ../../foo/script.py description = ACTION //foo:bar() restat = 1