remove a trailing space after variable bindings
This is for consistency and to make working with editors that
automatically delete trailing spaces from test expectations written in
raw string literals easier.
Change-Id: Idaa998712a6e97f746fccedf0a2f18ea5cd91403
Reviewed-on: https://gn-review.googlesource.com/c/gn/+/17601
Reviewed-by: David Turner <digit@google.com>
Commit-Queue: Takuto Ikuta <tikuta@google.com>
diff --git a/src/gn/ninja_binary_target_writer_unittest.cc b/src/gn/ninja_binary_target_writer_unittest.cc
index ab12c68..f390e88 100644
--- a/src/gn/ninja_binary_target_writer_unittest.cc
+++ b/src/gn/ninja_binary_target_writer_unittest.cc
@@ -108,8 +108,8 @@
"\n"
"build obj/foo/libbar.a: alink\n"
" arflags =\n"
- " output_extension = \n"
- " output_dir = \n";
+ " output_extension =\n"
+ " output_dir =\n";
std::string out_str = out.str();
EXPECT_EQ(expected, out_str);
}
diff --git a/src/gn/ninja_c_binary_target_writer.cc b/src/gn/ninja_c_binary_target_writer.cc
index 5e2be80..730840c 100644
--- a/src/gn/ninja_c_binary_target_writer.cc
+++ b/src/gn/ninja_c_binary_target_writer.cc
@@ -719,13 +719,21 @@
}
void NinjaCBinaryTargetWriter::WriteOutputSubstitutions() {
- out_ << " output_extension = "
- << SubstitutionWriter::GetLinkerSubstitution(
- target_, tool_, &SubstitutionOutputExtension);
+ const std::string output_extension =
+ SubstitutionWriter::GetLinkerSubstitution(target_, tool_,
+ &SubstitutionOutputExtension);
+ out_ << " output_extension =";
+ if (!output_extension.empty()) {
+ out_ << " " << output_extension;
+ }
out_ << std::endl;
- out_ << " output_dir = "
- << SubstitutionWriter::GetLinkerSubstitution(target_, tool_,
- &SubstitutionOutputDir);
+
+ const std::string output_dir = SubstitutionWriter::GetLinkerSubstitution(
+ target_, tool_, &SubstitutionOutputDir);
+ out_ << " output_dir =";
+ if (!output_dir.empty()) {
+ out_ << " " << output_dir;
+ }
out_ << std::endl;
}
diff --git a/src/gn/ninja_c_binary_target_writer_unittest.cc b/src/gn/ninja_c_binary_target_writer_unittest.cc
index 9fb8ff3..0316eb3 100644
--- a/src/gn/ninja_c_binary_target_writer_unittest.cc
+++ b/src/gn/ninja_c_binary_target_writer_unittest.cc
@@ -99,7 +99,7 @@
" frameworks =\n"
" swiftmodules =\n"
" output_extension = .so\n"
- " output_dir = \n";
+ " output_dir =\n";
std::string out_str = out.str();
EXPECT_EQ(expected, out_str) << expected << "\n" << out_str;
}
@@ -129,8 +129,8 @@
// this will probably fail in the archive tool.)
"build obj/foo/libstlib.a: alink || obj/foo/bar.stamp\n"
" arflags =\n"
- " output_extension = \n"
- " output_dir = \n";
+ " output_extension =\n"
+ " output_dir =\n";
std::string out_str = out.str();
EXPECT_EQ(expected, out_str) << expected << "\n" << out_str;
}
@@ -158,8 +158,8 @@
"obj/foo/bar.input2.o ../../foo/input3.o ../../foo/input4.obj "
"|| obj/foo/bar.stamp\n"
" arflags =\n"
- " output_extension = \n"
- " output_dir = \n";
+ " output_extension =\n"
+ " output_dir =\n";
std::string out_str = out.str();
EXPECT_EQ(expected, out_str) << expected << "\n" << out_str;
}
@@ -219,8 +219,8 @@
"\n"
"build obj/foo/libbar.a: alink obj/foo/libbar.input1.o\n"
" arflags = --asdf\n"
- " output_extension = \n"
- " output_dir = \n";
+ " output_extension =\n"
+ " output_dir =\n";
std::string out_str = out.str();
EXPECT_EQ(expected, out_str) << expected << "\n" << out_str;
}
@@ -269,8 +269,8 @@
"build obj/foo/libbar.a: alink obj/foo/libbar.input1.o "
"obj/foo/libbaz.input2.o || obj/foo/libbaz.a\n"
" arflags = --asdf\n"
- " output_extension = \n"
- " output_dir = \n";
+ " output_extension =\n"
+ " output_dir =\n";
std::string out_str = out.str();
EXPECT_EQ(expected, out_str) << expected << "\n" << out_str;
}
@@ -301,8 +301,8 @@
"build obj/foo/libbar.a: alink obj/foo/libbar.input1.o "
"|| obj/foo/libbaz.a\n"
" arflags = --asdf\n"
- " output_extension = \n"
- " output_dir = \n";
+ " output_extension =\n"
+ " output_dir =\n";
std::string out_str = out.str();
EXPECT_EQ(expected, out_str) << expected << "\n" << out_str;
}
@@ -504,7 +504,7 @@
" libs =\n"
" frameworks =\n"
" swiftmodules =\n"
- " output_extension = \n"
+ " output_extension =\n"
" output_dir = foo\n";
std::string final_str = final_out.str();
@@ -552,7 +552,7 @@
" frameworks =\n"
" swiftmodules =\n"
" output_extension = .so\n"
- " output_dir = \n";
+ " output_dir =\n";
std::string out_str = out.str();
EXPECT_EQ(expected, out_str) << expected << "\n" << out_str;
@@ -610,7 +610,7 @@
"-weak_framework Whizbang\n"
" swiftmodules =\n"
" output_extension = .so\n"
- " output_dir = \n";
+ " output_dir =\n";
std::string out_str = out.str();
EXPECT_EQ(expected, out_str) << expected << "\n" << out_str;
@@ -661,8 +661,8 @@
" libs =\n"
" frameworks =\n"
" swiftmodules =\n"
- " output_extension = \n"
- " output_dir = \n";
+ " output_extension =\n"
+ " output_dir =\n";
std::string out_str = out.str();
EXPECT_EQ(expected, out_str) << expected << "\n" << out_str;
@@ -753,8 +753,8 @@
" libs =\n"
" frameworks =\n"
" swiftmodules =\n"
- " output_extension = \n"
- " output_dir = \n";
+ " output_extension =\n"
+ " output_dir =\n";
EXPECT_EQ(final_expected, final_out.str());
}
@@ -795,7 +795,7 @@
" frameworks =\n"
" swiftmodules =\n"
" output_extension = .so\n"
- " output_dir = \n";
+ " output_dir =\n";
EXPECT_EQ(expected, out.str());
}
@@ -835,7 +835,7 @@
" frameworks =\n"
" swiftmodules =\n"
" output_extension = .so\n"
- " output_dir = \n";
+ " output_dir =\n";
EXPECT_EQ(loadable_expected, out.str());
// Final target.
@@ -872,8 +872,8 @@
" libs =\n"
" frameworks =\n"
" swiftmodules =\n"
- " output_extension = \n"
- " output_dir = \n";
+ " output_extension =\n"
+ " output_dir =\n";
EXPECT_EQ(final_expected, final_out.str());
}
@@ -1261,7 +1261,7 @@
" frameworks =\n"
" swiftmodules =\n"
" output_extension = .so\n"
- " output_dir = \n";
+ " output_dir =\n";
EXPECT_EQ(expected, out.str());
}
@@ -1414,8 +1414,8 @@
" libs =\n"
" frameworks =\n"
" swiftmodules =\n"
- " output_extension = \n"
- " output_dir = \n";
+ " output_extension =\n"
+ " output_dir =\n";
std::string out_str = out.str();
EXPECT_EQ(expected, out_str) << expected << "\n" << out_str;
@@ -1599,8 +1599,8 @@
" libs =\n"
" frameworks =\n"
" swiftmodules =\n"
- " output_extension = \n"
- " output_dir = \n"
+ " output_extension =\n"
+ " output_dir =\n"
" rlibs = obj/pub_in_staticlib/libpub_in_staticlib.rlib "
"obj/priv_in_staticlib/libpriv_in_staticlib.rlib\n";
@@ -1764,8 +1764,8 @@
" libs =\n"
" frameworks =\n"
" swiftmodules =\n"
- " output_extension = \n"
- " output_dir = \n"
+ " output_extension =\n"
+ " output_dir =\n"
" rlibs = obj/pub_in_staticlib/libpub_in_staticlib.rlib "
"obj/priv_in_staticlib/libpriv_in_staticlib.rlib "
"obj/rlib/librlib.rlib "
@@ -1836,8 +1836,8 @@
" libs =\n"
" frameworks =\n"
" swiftmodules =\n"
- " output_extension = \n"
- " output_dir = \n";
+ " output_extension =\n"
+ " output_dir =\n";
std::string out_str = out.str();
EXPECT_EQ(expected, out_str) << expected << "\n" << out_str;
@@ -1940,8 +1940,8 @@
" libs =\n"
" frameworks =\n"
" swiftmodules =\n"
- " output_extension = \n"
- " output_dir = \n"
+ " output_extension =\n"
+ " output_dir =\n"
" rlibs = obj/near/libnear.rlib\n";
std::string out_str = out.str();
@@ -2038,8 +2038,8 @@
" libs =\n"
" frameworks =\n"
" swiftmodules =\n"
- " output_extension = \n"
- " output_dir = \n"
+ " output_extension =\n"
+ " output_dir =\n"
" rlibs = obj/rlib/librlib.rlib\n";
std::string out_str = out.str();
@@ -2136,8 +2136,8 @@
" libs =\n"
" frameworks =\n"
" swiftmodules =\n"
- " output_extension = \n"
- " output_dir = \n"
+ " output_extension =\n"
+ " output_dir =\n"
" rlibs = obj/rlib/librlib.rlib\n";
std::string out_str = out.str();
@@ -2245,8 +2245,8 @@
" libs =\n"
" frameworks =\n"
" swiftmodules =\n"
- " output_extension = \n"
- " output_dir = \n"
+ " output_extension =\n"
+ " output_dir =\n"
" rlibs = obj/rlib2/libmyrlib2.rlib\n";
std::string out_str = out.str();
@@ -2294,8 +2294,8 @@
"\n"
"build obj/foo/libbar.a: alink obj/foo/libbar.bar.o\n"
" arflags =\n"
- " output_extension = \n"
- " output_dir = \n";
+ " output_extension =\n"
+ " output_dir =\n";
std::string out_str = out.str();
EXPECT_EQ(expected, out_str) << expected << "\n" << out_str;
}
@@ -2456,8 +2456,8 @@
" libs =\n"
" frameworks =\n"
" swiftmodules = obj/foo/Foo.swiftmodule\n"
- " output_extension = \n"
- " output_dir = \n";
+ " output_extension =\n"
+ " output_dir =\n";
const std::string out_str = out.str();
EXPECT_EQ(expected, out_str) << expected << "\n" << out_str;
@@ -2559,8 +2559,8 @@
build obj/blah/liba.a: alink obj/blah/liba.a.o
arflags =
- output_extension =
- output_dir =
+ output_extension =
+ output_dir =
)";
std::string out_str = out.str();
@@ -2604,8 +2604,8 @@
build obj/stuff/libb.a: alink obj/stuff/libb.b.o
arflags =
- output_extension =
- output_dir =
+ output_extension =
+ output_dir =
)";
std::string out_str = out.str();
@@ -2645,8 +2645,8 @@
build obj/things/libc.a: alink || obj/blah/liba.a
arflags =
- output_extension =
- output_dir =
+ output_extension =
+ output_dir =
)";
std::string out_str = out.str();
@@ -2692,8 +2692,8 @@
libs =
frameworks =
swiftmodules =
- output_extension =
- output_dir =
+ output_extension =
+ output_dir =
)";
std::string out_str = out.str();
@@ -2747,8 +2747,8 @@
libs =
frameworks =
swiftmodules =
- output_extension =
- output_dir =
+ output_extension =
+ output_dir =
)"
#if defined(OS_WIN)
" solibs = \"./Space$ Cadet.so\"\n";
@@ -2799,8 +2799,8 @@
" libs =\n"
" frameworks =\n"
" swiftmodules =\n"
- " output_extension = \n"
- " output_dir = \n"
+ " output_extension =\n"
+ " output_dir =\n"
" pool = foo_pool\n";
std::string out_str = out.str();
EXPECT_EQ(expected, out_str) << expected << "\n" << out_str;
