diff options
| author | Nicholas Hutchinson <nshutchinson@gmail.com> | 2013-11-30 22:33:02 (GMT) |
|---|---|---|
| committer | Nicholas Hutchinson <nshutchinson@gmail.com> | 2014-01-06 19:30:28 (GMT) |
| commit | 664edba804ddd5363299f2af5183109bdc9715b1 (patch) | |
| tree | c50e267ade56530904676f103905d4a8a2ba3ba0 /src/manifest_parser_test.cc | |
| parent | 2517b75781decd49bc82f05f8336c509f7b2c62e (diff) | |
| download | Ninja-664edba804ddd5363299f2af5183109bdc9715b1.zip Ninja-664edba804ddd5363299f2af5183109bdc9715b1.tar.gz Ninja-664edba804ddd5363299f2af5183109bdc9715b1.tar.bz2 | |
More robust escaping of $in, $out paths
In summary: don’t escape if the path doesn’t contain problematic characters, otherwise:
- Shell: enclose string in single quotes, escape embedded single quotes with the magic quote-backslash-quote sequence
- Win32: Escape double quotes by doubling the number of consecutive backslashes that precede them (if any) and adding one more. Finally, double the number of trailing backslashes, and enclose the whole thing in double quotes.
Diffstat (limited to 'src/manifest_parser_test.cc')
| -rw-r--r-- | src/manifest_parser_test.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/manifest_parser_test.cc b/src/manifest_parser_test.cc index 0b4c042..152b965 100644 --- a/src/manifest_parser_test.cc +++ b/src/manifest_parser_test.cc @@ -236,7 +236,11 @@ TEST_F(ParserTest, Dollars) { "build $x: foo y\n" )); EXPECT_EQ("$dollar", state.bindings_.LookupVariable("x")); +#ifdef _WIN32 EXPECT_EQ("$dollarbar$baz$blah", state.edges_[0]->EvaluateCommand()); +#else + EXPECT_EQ("'$dollar'bar$baz$blah", state.edges_[0]->EvaluateCommand()); +#endif } TEST_F(ParserTest, EscapeSpaces) { |