From 7287943b470c3fe6ceefd1f9a9fea68736a2b37f Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Wed, 17 Apr 2019 15:01:52 +0200
Subject: Fix emacs tests

Didn't work if installed path contained spaces or unicode characters.
---
 lib/tools/test/emacs_SUITE.erl | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/tools/test/emacs_SUITE.erl b/lib/tools/test/emacs_SUITE.erl
index 8756a4e9b3..73270e6ed6 100644
--- a/lib/tools/test/emacs_SUITE.erl
+++ b/lib/tools/test/emacs_SUITE.erl
@@ -119,7 +119,7 @@ compile_and_load(_Config) ->
                                      false -> " "
                                  end,
                       emacs([Pedantic,
-                             " -f batch-byte-compile ",filename:join(Dir, File)]),
+                             " -f batch-byte-compile ", dquote(filename:join(Dir, File))]),
                       true
               end,
     lists:foreach(Compile, Files),
@@ -144,6 +144,10 @@ tests_compiled(_Config) ->
             ok
     end.
 
+
+dquote(Str) ->
+    "\"" ++ Str ++ "\"".
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 indent(Config) ->
@@ -207,14 +211,14 @@ emacs_version_ok(AcceptVer) ->
 emacs(EmacsCmds) when is_list(EmacsCmds) ->
     Cmd = ["emacs ",
            "--batch --quick ",
-           "--directory ", emacs_dir(), " ",
+           "--directory ", dquote(emacs_dir()), " ",
            "--eval \"(require 'erlang-start)\" "
            | EmacsCmds],
     Res0 = os:cmd(Cmd ++ " ; echo $?"),
     Rows = string:lexemes(Res0, ["\r\n", $\n]),
     Res = lists:last(Rows),
     Output = string:join(lists:droplast(Rows), "\n"),
-    io:format("Cmd ~s:~n  => ~s ~ts~n", [Cmd, Res, Output]),
+    io:format("Cmd ~ts:~n  => ~s ~ts~n", [Cmd, Res, Output]),
     "0" = Res,
     Output.
 
-- 
cgit v1.2.3