[tor-commits] [tor/master] Try to fix windows config/include_path_syntax test

[nickm at torproject.org]

commit 3628efe29c170025cec1001001a141dc3f9c5860
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 19 09:55:22 2017 -0400

    Try to fix windows config/include_path_syntax test
    
    It was trying to do %include "foo\", which won't work.  It has to be
    %include "foo\\".
---
 src/test/test_config.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index 8419acb..80579ea 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -5172,11 +5172,17 @@ test_config_include_path_syntax(void *data)
   tt_int_op(mkdir(dir, 0700), OP_EQ, 0);
 #endif
 
+#ifdef _WIN32
+#define ESCAPED_PATH_SEPARATOR "\\" PATH_SEPARATOR
+#else
+#define ESCAPED_PATH_SEPARATOR PATH_SEPARATOR
+#endif
+
   char torrc_contents[1000];
   tor_snprintf(torrc_contents, sizeof(torrc_contents),
                "%%include \"%s\"\n"
                "%%include %s"PATH_SEPARATOR"\n"
-               "%%include \"%s"PATH_SEPARATOR"\"\n",
+                "%%include \"%s"ESCAPED_PATH_SEPARATOR"\"\n",
                dir, dir, dir);
 
   int include_used;