Redo escaping in GN

tools/gn/escape_unittest.cc

Index: tools/gn/escape_unittest.cc
diff --git a/tools/gn/escape_unittest.cc b/tools/gn/escape_unittest.cc
index 9d0cf7a9000acbf29ec26c22b562243be0d9787d..dc15af66bef99b8f70a1647de8ae774302c7d850 100644
--- a/tools/gn/escape_unittest.cc
+++ b/tools/gn/escape_unittest.cc
@@ -12,69 +12,41 @@ TEST(Escape, Ninja) {
   EXPECT_EQ("asdf$:$ \"$$\\bar", result);
 }
 
-TEST(Escape, Shell) {
+TEST(Escape, WindowsFork) {
   EscapeOptions opts;
-  opts.mode = ESCAPE_SHELL;
-  std::string result = EscapeString("asdf: \"$\\bar", opts, NULL);
-#if defined(OS_WIN)
-  // Windows shell doesn't escape backslashes, but it does backslash-escape
-  // quotes.
-  EXPECT_EQ("\"asdf: \\\"\\$\\bar\"", result);
-#else
-  EXPECT_EQ("\"asdf: \\\"\\$\\\\bar\"", result);
-#endif
-
-  // Some more generic shell chars.
-  result = EscapeString("a_;<*b", opts, NULL);
-  EXPECT_EQ("a_\\;\\<\\*b", result);
-}
+  opts.mode = ESCAPE_NINJA_FORK;
+  opts.platform = ESCAPE_PLATFORM_WIN;
 
-TEST(Escape, NinjaShell) {
-  EscapeOptions opts;
-  opts.mode = ESCAPE_NINJA_SHELL;
+  // Regular string is passed, even if it has backslashes.
+  EXPECT_EQ("foo\\bar", EscapeString("foo\\bar", opts, NULL));
 
-  // When escaping for Ninja and the shell, we would escape a $, then escape
-  // the backslash again.
-  std::string result = EscapeString("a$b", opts, NULL);
-  EXPECT_EQ("a\\$$b", result);
-}
+  // Spaces means the string is quoted, normal backslahes untouched.
+  bool needs_quoting = false;
+  EXPECT_EQ("\"foo\\$ bar\"", EscapeString("foo\\ bar", opts, &needs_quoting));
+  EXPECT_TRUE(needs_quoting);
 
-TEST(Escape, UsedQuotes) {
-  EscapeOptions shell_options;
-  shell_options.mode = ESCAPE_SHELL;
+  // Inhibit quoting.
+  needs_quoting = false;
+  opts.inhibit_quoting = true;
+  EXPECT_EQ("foo\\$ bar", EscapeString("foo\\ bar", opts, &needs_quoting));
+  EXPECT_TRUE(needs_quoting);
+  opts.inhibit_quoting = false;
 
-  EscapeOptions ninja_options;
-  ninja_options.mode = ESCAPE_NINJA;
+  // Backslashes at the end of the string get escaped.
+  EXPECT_EQ("\"foo$ bar\\\\\\\\\"", EscapeString("foo bar\\\\", opts, NULL));
 
-  EscapeOptions ninja_shell_options;
-  ninja_shell_options.mode = ESCAPE_NINJA_SHELL;
-
-  // Shell escaping with quoting inhibited.
-  bool used_quotes = false;
-  shell_options.inhibit_quoting = true;
-  EXPECT_EQ("foo bar", EscapeString("foo bar", shell_options, &used_quotes));
-  EXPECT_TRUE(used_quotes);
-
-  // Shell escaping with regular quoting.
-  used_quotes = false;
-  shell_options.inhibit_quoting = false;
-  EXPECT_EQ("\"foo bar\"",
-            EscapeString("foo bar", shell_options, &used_quotes));
-  EXPECT_TRUE(used_quotes);
+  // Backslahes preceeding quotes are escaped, and the quote is escaped.

[scottmg, 2014/06/04 21:21:27]

"Backslashes"

+  EXPECT_EQ("\"foo\\\\\\\"$ bar\"", EscapeString("foo\\\" bar", opts, NULL));
+}
 
-  // Ninja shell escaping should be the same.
-  used_quotes = false;
-  EXPECT_EQ("\"foo$ bar\"",
-            EscapeString("foo bar", ninja_shell_options, &used_quotes));
-  EXPECT_TRUE(used_quotes);
+TEST(Escape, PosixFork) {
+  EscapeOptions opts;
+  opts.mode = ESCAPE_NINJA_FORK;
+  opts.platform = ESCAPE_PLATFORM_POSIX;
 
-  // Ninja escaping shouldn't use quoting.
-  used_quotes = false;
-  EXPECT_EQ("foo$ bar", EscapeString("foo bar", ninja_options, &used_quotes));
-  EXPECT_FALSE(used_quotes);
+  // : and $ ninja escaped with $. Then Shell-escape backslashes and quotes.
+  EXPECT_EQ("a$:\\$ \\\"\\$$\\\\b", EscapeString("a: \"$\\b", opts, NULL));
 
-  // Used quotes not reset if it's already true.
-  used_quotes = true;
-  EscapeString("foo", ninja_options, &used_quotes);
-  EXPECT_TRUE(used_quotes);
+  // Some more generic shell chars.
+  EXPECT_EQ("a_\\;\\<\\*b", EscapeString("a_;<*b", opts, NULL));
 }