[ct] Print unicode atoms and strings correctly in common_test logs

And use correct encoding when printing to files.

11 files changed, 395 insertions, 77 deletions

diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile
index 4f3e0e8266..0d9149f489 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -72,7 +72,8 @@ MODULES= \
 	ct_release_test_SUITE \
 	ct_log_SUITE \
         ct_SUITE \
-	ct_keep_logs_SUITE
+	ct_keep_logs_SUITE \
+	ct_unicode_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 HRL_FILES= test_server_test_lib.hrl
diff --git a/lib/common_test/test/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl
index cbbfe408a8..97c7abf3e6 100644
--- a/lib/common_test/test/ct_config_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE.erl
@@ -172,10 +172,10 @@ testspec_dynamic(Config) when is_list(Config) ->
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
 make_spec(DataDir, ConfigDir, Filename, Suites, Config)->
-    {ok, Fd} = file:open(filename:join(ConfigDir, Filename), [write]),
-    ok = file:write(Fd,
-		    io_lib:format("{suites, \"~sconfig/test/\", ~p}.~n", [DataDir, Suites])),
-    lists:foreach(fun(C)-> ok=file:write(Fd, io_lib:format("~p.~n", [C])) end, Config),
+    {ok, Fd} = file:open(filename:join(ConfigDir, Filename),
+                         [write, {encoding,utf8}]),
+    ok = io:format(Fd,"{suites, \"~tsconfig/test/\", ~p}.~n", [DataDir, Suites]),
+    lists:foreach(fun(C)-> ok=io:format(Fd, "~tp.~n", [C]) end, Config),
     ok = file:close(Fd).
 
 run_test(Name, Config, CTConfig, SuiteNames)->
diff --git a/lib/common_test/test/ct_keep_logs_SUITE.erl b/lib/common_test/test/ct_keep_logs_SUITE.erl
index 6b7aaa57ac..83b7963d7d 100644
--- a/lib/common_test/test/ct_keep_logs_SUITE.erl
+++ b/lib/common_test/test/ct_keep_logs_SUITE.erl
@@ -72,7 +72,7 @@ keep_logs(Config) ->
     LogDir=?config(logdir,Opts),
     KeepLogsDir = create_dir(filename:join(LogDir,"keep_logs-")),
     Opts1 = lists:keyreplace(logdir,1,Opts,{logdir,KeepLogsDir}),
-    ct:log("New LogDir = ~s", [KeepLogsDir]),
+    ct:log("New LogDir = ~ts", [KeepLogsDir]),
 
     %% Create 6 ct_run.* log directories
     [ok = ct_test_support:run(Opts1, Config) || _ <- lists:seq(1,3)],
@@ -134,7 +134,7 @@ refresh_logs(Config) ->
     LogDir=?config(logdir,Opts0),
     KeepLogsDir = create_dir(filename:join(LogDir,"refresh_logs-")),
     Opts1 = lists:keyreplace(logdir,1,Opts0,{logdir,KeepLogsDir}),
-    ct:log("New LogDir = ~s", [KeepLogsDir]),
+    ct:log("New LogDir = ~ts", [KeepLogsDir]),
 
     %% Create 6 ct_run.* log directories
     SuiteOpts = [{suite,Suite},{label,refresh_logs} | Opts1],
diff --git a/lib/common_test/test/ct_surefire_SUITE.erl b/lib/common_test/test/ct_surefire_SUITE.erl
index 832e105517..a71288fb12 100644
--- a/lib/common_test/test/ct_surefire_SUITE.erl
+++ b/lib/common_test/test/ct_surefire_SUITE.erl
@@ -304,7 +304,7 @@ test_events(Test) ->
 check_xml(Case,XmlRe) ->
     case filelib:wildcard(XmlRe) of
 	[] ->
-	    ct:fail("No xml files found with regexp ~p~n", [XmlRe]);
+	    ct:fail("No xml files found with regexp ~tp~n", [XmlRe]);
 	[_] = Xmls when Case==absolute_path ->
 	    do_check_xml(Case,Xmls);
 	[_,_] = Xmls ->
@@ -326,12 +326,12 @@ check_xml(Case,XmlRe) ->
 %%  ...
 %% </testsuites>
 do_check_xml(Case,[Xml|Xmls]) ->
-    ct:log("Checking <a href=~p>~s</a>~n",[Xml,Xml]),
+    ct:log("Checking <a href=~tp>~ts</a>~n",[Xml,Xml]),
     {E,_} = xmerl_scan:file(Xml),
     Expected = events_to_result(lists:flatten(test_events(Case))),
     ParseResult = testsuites(Case,E),
-    ct:log("Expecting: ~p~n",[Expected]),
-    ct:log("Actual   : ~p~n",[ParseResult]),
+    ct:log("Expecting: ~tp~n",[Expected]),
+    ct:log("Actual   : ~tp~n",[ParseResult]),
     Expected = ParseResult,
     do_check_xml(Case,Xmls);
 do_check_xml(_,[]) ->
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index ba7aadfeec..44c27e54c2 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -67,7 +67,7 @@ init_per_suite(Config, Level) ->
     end,
     case delete_old_logs(os:type(), Config) of
 	{'EXIT',DelLogsReason} ->
-	    test_server:format(0, "Failed to delete old log directories: ~p~n", 
+	    test_server:format(0, "Failed to delete old log directories: ~tp~n",
 			       [DelLogsReason]);
 	_ ->
 	    ok
@@ -91,7 +91,8 @@ start_slave(NodeName, Config, Level) ->
     [_,Host] = string:tokens(atom_to_list(node()), "@"),
     test_server:format(0, "Trying to start ~s~n",
 		       [atom_to_list(NodeName)++"@"++Host]),
-    case slave:start(Host, NodeName, []) of
+    PR = proplists:get_value(printable_range,Config,io:printable_range()),
+    case slave:start(Host, NodeName, "+pc " ++ atom_to_list(PR)) of
 	{error,Reason} ->
 	    test_server:fail(Reason);
 	{ok,CTNode} ->
@@ -119,7 +120,7 @@ start_slave(NodeName, Config, Level) ->
 	    [true = rpc:call(CTNode, code, add_patha, [D]) || D <- PathDirs],
 	    test_server:format(Level, "Dirs added to code path (on ~w):~n",
 			       [CTNode]),
-	    [io:format("~s~n", [D]) || D <- PathDirs],
+	    [io:format("~ts~n", [D]) || D <- PathDirs],
 	    
 	    case proplists:get_value(start_sasl, Config) of
 		true ->
@@ -161,12 +162,12 @@ init_per_testcase(_TestCase, Config) ->
     case lists:keysearch(master, 1, Config) of
 	false->
 	    test_server:format("See Common Test logs here:\n\n"
-			       "<a href=\"file://~s/all_runs.html\">~s/all_runs.html</a>\n"
-			       "<a href=\"file://~s/index.html\">~s/index.html</a>",
+			       "<a href=\"file://~ts/all_runs.html\">~ts/all_runs.html</a>\n"
+			       "<a href=\"file://~ts/index.html\">~ts/index.html</a>",
 			       [LogDir,LogDir,LogDir,LogDir]);
 	{value, _}->
 	    test_server:format("See CT Master Test logs here:\n\n"
-		       "<a href=\"file://~s/master_runs.html\">~s/master_runs.html</a>",
+		       "<a href=\"file://~ts/master_runs.html\">~ts/master_runs.html</a>",
 		       [LogDir,LogDir])
     end,
     Config.
@@ -192,11 +193,11 @@ write_testspec(TestSpec, Dir, Name) ->
     write_testspec(TestSpec, filename:join(Dir, Name)).
 
 write_testspec(TestSpec, TSFile) ->
-    {ok,Dev} = file:open(TSFile, [write]),
-    [io:format(Dev, "~p.~n", [Entry]) || Entry <- TestSpec],
+    {ok,Dev} = file:open(TSFile, [write,{encoding,utf8}]),
+    [io:format(Dev, "~tp.~n", [Entry]) || Entry <- TestSpec],
     file:close(Dev),
-    io:format("Test specification written to: ~p~n", [TSFile]),
-    io:format(user, "Test specification written to: ~p~n", [TSFile]),
+    io:format("Test specification written to: ~tp~n", [TSFile]),
+    io:format(user, "Test specification written to: ~tp~n", [TSFile]),
     TSFile.
     
 
@@ -269,7 +270,7 @@ run(Opts0, Config) when is_list(Opts0) ->
 				Override =
 				    fun(O={Key,_}, Os) ->
 					    io:format(user, "ADDING START "
-						      "OPTION: ~p~n", [O]),
+						      "OPTION: ~tp~n", [O]),
 					    [O | lists:keydelete(Key, 1, Os)]
 				    end,
 				lists:foldl(Override, Opts0, OROpts);
@@ -291,14 +292,14 @@ run(Opts0, Config) when is_list(Opts0) ->
 run_ct_run_test(Opts,Config) ->
     CTNode = proplists:get_value(ct_node, Config),
     Level = proplists:get_value(trace_level, Config),
-    test_server:format(Level, "~n[RUN #1] Calling ct:run_test(~p) on ~p~n",
+    test_server:format(Level, "~n[RUN #1] Calling ct:run_test(~tp) on ~p~n",
 		       [Opts, CTNode]),
     
     T0 = erlang:monotonic_time(),
     CtRunTestResult = rpc:call(CTNode, ct, run_test, [Opts]),
     T1 = erlang:monotonic_time(),
     Elapsed = erlang:convert_time_unit(T1-T0, native, milli_seconds),
-    test_server:format(Level, "~n[RUN #1] Got return value ~p after ~p ms~n",
+    test_server:format(Level, "~n[RUN #1] Got return value ~tp after ~p ms~n",
 		       [CtRunTestResult,Elapsed]),
     case rpc:call(CTNode, erlang, whereis, [ct_util_server]) of
 	undefined ->
@@ -316,7 +317,7 @@ run_ct_script_start(Opts, Config) ->
     CTNode = proplists:get_value(ct_node, Config),
     Level = proplists:get_value(trace_level, Config),
     Opts1 = [{halt_with,{?MODULE,ct_test_halt}} | Opts],
-    test_server:format(Level, "Saving start opts on ~p: ~p~n",
+    test_server:format(Level, "Saving start opts on ~p: ~tp~n",
 		       [CTNode, Opts1]),
     rpc:call(CTNode, application, set_env,
 	     [common_test, run_test_start_opts, Opts1]),
@@ -326,7 +327,7 @@ run_ct_script_start(Opts, Config) ->
     ExitStatus = rpc:call(CTNode, ct_run, script_start, []),
     T1 = erlang:monotonic_time(),
     Elapsed = erlang:convert_time_unit(T1-T0, native, milli_seconds),
-    test_server:format(Level, "[RUN #2] Got exit status value ~p after ~p ms~n",
+    test_server:format(Level, "[RUN #2] Got exit status value ~tp after ~p ms~n",
 		       [ExitStatus,Elapsed]),
     ExitStatus.
 
@@ -372,12 +373,12 @@ run({M,F,A}, InitCalls, Config) ->
     Level = proplists:get_value(trace_level, Config),
     lists:foreach(
       fun({IM,IF,IA}) ->
-	      test_server:format(Level, "~nInit call ~w:~w(~p) on ~p...~n",
+	      test_server:format(Level, "~nInit call ~w:~tw(~tp) on ~p...~n",
 				 [IM, IF, IA, CTNode]),
 	      Result = rpc:call(CTNode, IM, IF, IA),
-	      test_server:format(Level, "~n...with result: ~p~n", [Result])
+	      test_server:format(Level, "~n...with result: ~tp~n", [Result])
       end, InitCalls),
-    test_server:format(Level, "~nStarting test with ~w:~w(~p) on ~p~n",
+    test_server:format(Level, "~nStarting test with ~w:~tw(~tp) on ~p~n",
 		       [M, F, A, CTNode]),
     rpc:call(CTNode, M, F, A).
 
@@ -404,7 +405,7 @@ wait_for_ct_stop(Retries, CTNode) ->
 	    Info = (catch process_info(Pid)),
 	    test_server:format(0, "Waiting for CT (~p) to finish (~p)...", 
 			       [Pid,Retries]),
-	    test_server:format(0, "Process info for ~p:~n~p", [Info]), 
+	    test_server:format(0, "Process info for ~p:~n~tp", [Pid,Info]),
 	    timer:sleep(5000),
 	    wait_for_ct_stop(Retries-1, CTNode)
     end.
@@ -414,7 +415,7 @@ wait_for_ct_stop(Retries, CTNode) ->
 ct_rpc({M,F,A}, Config) ->
     CTNode = proplists:get_value(ct_node, Config),
     Level = proplists:get_value(trace_level, Config),
-    test_server:format(Level, "~nCalling ~w:~w(~p) on ~p...",
+    test_server:format(Level, "~nCalling ~w:~tw(~tp) on ~p...",
 		       [M,F,A, CTNode]),
     rpc:call(CTNode, M, F, A).
 
@@ -530,7 +531,7 @@ verify_events(TEvs, Evs, Node, Config) ->
 
 verify_events1([TestEv|_], [{TEH,#event{name=stop_logging,node=Node,data=_}}|_], Node, _)
   when element(1,TestEv) == TEH, element(2,TestEv) =/= stop_logging ->
-    test_server:format("Failed to find ~p in the list of events!~n", [TestEv]),
+    test_server:format("Failed to find ~tp in the list of events!~n", [TestEv]),
     exit({event_not_found,TestEv});
 
 verify_events1(TEvs = [TestEv | TestEvs], Evs = [_|Events], Node, Config) ->
@@ -538,8 +539,8 @@ verify_events1(TEvs = [TestEv | TestEvs], Evs = [_|Events], Node, Config) ->
 	nomatch ->
 	    verify_events1(TEvs, Events, Node, Config);
 	{'EXIT',Reason} ->
-	    test_server:format("Failed to find ~p in ~p~n"
-			       "Reason: ~p~n", [TestEv,Evs,Reason]),
+	    test_server:format("Failed to find ~tp in ~tp~n"
+			       "Reason: ~tp~n", [TestEv,Evs,Reason]),
 	    exit(Reason);
 	{Config1,Events1} ->
 	    if is_list(TestEv) ->
@@ -547,13 +548,13 @@ verify_events1(TEvs = [TestEv | TestEvs], Evs = [_|Events], Node, Config) ->
 	       element(1,TestEv) == parallel ; element(1,TestEv) == shuffle ->
 		    ok;
 	       true ->
-		    test_server:format("Found ~p!", [TestEv])
+		    test_server:format("Found ~tp!", [TestEv])
 	    end,
 	    verify_events1(TestEvs, Events1, Node, Config1)
     end;
 
 verify_events1([TestEv|_], [], _, _) ->
-    test_server:format("Failed to find ~p in the list of events!~n", [TestEv]),
+    test_server:format("Failed to find ~tp in the list of events!~n", [TestEv]),
     exit({event_not_found,TestEv});
 
 verify_events1([], Evs, _, Config) ->
@@ -586,8 +587,8 @@ locate(TEvs, Node, Evs, Config) when is_list(TEvs) ->
 			false ->
 			    nomatch;
 			true ->
-			    test_server:format("Found ~p!", [InitStart]),
-			    test_server:format("Found ~p!", [InitDone]),
+			    test_server:format("Found ~tp!", [InitStart]),
+			    test_server:format("Found ~tp!", [InitDone]),
 			    verify_events1(TEvs1, Evs1, Node, Config)
 		    end;
 		_ ->
@@ -635,8 +636,8 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 					true
 				end, Es),	      
 			
-			test_server:format("Found ~p!", [InitStart]),
-			test_server:format("Found ~p!", [InitDone]),
+			test_server:format("Found ~tp!", [InitStart]),
+			test_server:format("Found ~tp!", [InitDone]),
 			{TEs,EvsG};
 		    _ ->
 			nomatch
@@ -688,10 +689,10 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 			      [] when Evs2 == [] ->
 				  exit({unmatched,TEv});
 			      [] ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  exit({tc_done_not_found,TEv});
 			      [TcDone|Evs3] ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  RemSize1 = length(Evs3),
 				  if RemSize1 < RemSize ->
 					  {[TcDone|Done],Evs3,RemSize1};
@@ -707,7 +708,7 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 				     EH == TEH, EvNode == Node, Mod == M, 
 				     Func == F, result_match(R, Result)] of
 			      [TcDone|_] ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  {lists:delete(TcDone, Done),RemEvs,RemSize};
 			      [] ->
 				  exit({unmatched,TEv})
@@ -735,7 +736,7 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 			      [] -> 
 				  exit({end_per_group_not_found,TEv});
 			      [_ | RemEvs2] ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  {Done,RemEvs2,length(RemEvs2)}
 			  end;
 		     %% tc_done event for end_per_group
@@ -766,7 +767,7 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 			      [] -> 
 				  exit({end_per_group_not_found,TEv});
 			      [_ | RemEvs2] ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  {Done,RemEvs2,length(RemEvs2)}
 			  end;
 		     %% end_per_group auto- or user skipped
@@ -813,7 +814,7 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 			      [] ->
 				  exit({unmatched,TEv});
 			      _ ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  Acc
 			  end;
 		     %% start of a sub-group
@@ -866,8 +867,8 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 				    _ ->
 					Props = EvProps
 				end,
-				test_server:format("Found ~p!", [InitStart]),
-				test_server:format("Found ~p!", [InitDone]),
+				test_server:format("Found ~tp!", [InitStart]),
+				test_server:format("Found ~tp!", [InitDone]),
 				{TEs,Es};
 			    false ->
 				nomatch
@@ -908,7 +909,7 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 			      [_TcStart, TcDone={TEH,#event{name=tc_done,
 							    node=Node,
 							    data={M,F,_}}} | Evs3] ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  RemSize1 = length(Evs3),
 				  if RemSize1 < RemSize -> 
 					  {[TcDone|Done],Evs3,RemSize1};
@@ -924,7 +925,7 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 				     EH == TEH, EvNode == Node, Mod == M, 
 				     Func == F, result_match(R, Result)] of
 			      [TcDone|_] ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  {lists:delete(TcDone, Done),RemEvs,RemSize};
 			      [] ->
 				  exit({unmatched,TEv})
@@ -965,7 +966,7 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 				      _ ->
 					  Props = EvProps1
 				  end,
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  {Done,RemEvs2,length(RemEvs2)}
 			  end;
 		     %% tc_done event for end_per_group
@@ -1009,7 +1010,7 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 				      _ ->
 					  Props = EvProps1
 				  end,				  
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  {Done,RemEvs2,length(RemEvs2)}
 			  end;
 		     %% end_per_group auto-or user skipped
@@ -1050,7 +1051,7 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 			      [] ->
 				  exit({unmatched,TEv});
 			      _ ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  Acc
 			  end;
 		     (TEv={TEH,N,D}, Acc) ->
@@ -1061,7 +1062,7 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 			      [] ->
 				  exit({unmatched,TEv});
 			      _ ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  Acc
 			  end;
 		     %% start of a sub-group
@@ -1232,54 +1233,54 @@ result_match(_, _) ->
 
 log_events(TC, Events, EvLogDir, Opts) ->
     LogFile = filename:join(EvLogDir, atom_to_list(TC)++".events"),
-    {ok,Dev} = file:open(LogFile, [write]),
+    {ok,Dev} = file:open(LogFile, [write,{encoding,utf8}]),
     io:format(Dev, "[~n", []),
     log_events1(Events, Dev, " "),
     file:close(Dev),
     FullLogFile = join_abs_dirs(proplists:get_value(net_dir, Opts),
 				LogFile),
-    ct:log("Events written to logfile: <a href=\"file://~s\">~s</a>~n",
+    ct:log("Events written to logfile: <a href=\"file://~ts\">~ts</a>~n",
 	   [FullLogFile,FullLogFile],[no_css]),
-    io:format(user, "Events written to logfile: ~p~n", [LogFile]).
+    io:format(user, "Events written to logfile: ~tp~n", [LogFile]).
 
 log_events1(Evs, Dev, "") ->
     log_events1(Evs, Dev, " ");
 log_events1([E={_EH,tc_start,{_M,{init_per_group,_GrName,Props}}} | Evs], Dev, Ind) ->
     case get_prop(Props) of
 	undefined ->
-	    io:format(Dev, "~s[~p,~n", [Ind,E]),
+	    io:format(Dev, "~s[~tp,~n", [Ind,E]),
 	    log_events1(Evs, Dev, Ind++" ");	    
 	Prop ->
-	    io:format(Dev, "~s{~w,~n~s[~p,~n", [Ind,Prop,Ind++" ",E]),
+	    io:format(Dev, "~s{~w,~n~s[~tp,~n", [Ind,Prop,Ind++" ",E]),
 	    log_events1(Evs, Dev, Ind++"  ")
     end;
 log_events1([E={_EH,tc_done,{_M,{init_per_group,_GrName,_Props},_R}} | Evs], Dev, Ind) ->
-    io:format(Dev, "~s~p,~n", [Ind,E]),
+    io:format(Dev, "~s~tp,~n", [Ind,E]),
     log_events1(Evs, Dev, Ind++" ");
 log_events1([E={_EH,tc_start,{_M,{end_per_group,_GrName,_Props}}} | Evs], Dev, Ind) ->
     Ind1 = Ind -- " ",
-    io:format(Dev, "~s~p,~n", [Ind1,E]),
+    io:format(Dev, "~s~tp,~n", [Ind1,E]),
     log_events1(Evs, Dev, Ind1);
 log_events1([E={_EH,tc_done,{_M,{end_per_group,_GrName,Props},_R}} | Evs], Dev, Ind) ->
     case get_prop(Props) of
 	undefined ->
-	    io:format(Dev, "~s~p],~n", [Ind,E]),
+	    io:format(Dev, "~s~tp],~n", [Ind,E]),
 	    log_events1(Evs, Dev, Ind--" ");
 	_Prop ->
-	    io:format(Dev, "~s~p]},~n", [Ind,E]),
+	    io:format(Dev, "~s~tp]},~n", [Ind,E]),
 	    log_events1(Evs, Dev, Ind--"  ")
     end;
 log_events1([E={_EH,tc_auto_skip,{_M,{end_per_group,_GrName},_Reason}} | Evs], Dev, Ind) ->
-    io:format(Dev, "~s~p],~n", [Ind,E]),
+    io:format(Dev, "~s~tp],~n", [Ind,E]),
     log_events1(Evs, Dev, Ind--" ");
 log_events1([E={_EH,tc_user_skip,{_M,{end_per_group,_GrName},_Reason}} | Evs], Dev, Ind) ->
-    io:format(Dev, "~s~p],~n", [Ind,E]),
+    io:format(Dev, "~s~tp],~n", [Ind,E]),
     log_events1(Evs, Dev, Ind--" ");
 log_events1([E], Dev, Ind) ->
-    io:format(Dev, "~s~p~n].~n", [Ind,E]),
+    io:format(Dev, "~s~tp~n].~n", [Ind,E]),
     ok;
 log_events1([E | Evs], Dev, Ind) ->
-    io:format(Dev, "~s~p,~n", [Ind,E]),
+    io:format(Dev, "~s~tp,~n", [Ind,E]),
     log_events1(Evs, Dev, Ind);
 log_events1([], _Dev, _Ind) ->
     ok.
@@ -1393,10 +1394,10 @@ delete_dirs(LogDir) ->
 delete_dirs(_, []) ->
     ok;
 delete_dirs(LogDir, [Dir | Dirs]) ->
-    test_server:format(0, "Removing old log directory: ~s", [Dir]),
+    test_server:format(0, "Removing old log directory: ~ts", [Dir]),
     case catch rm_rec(Dir) of
 	{_,Reason} ->
-	    test_server:format(0, "Delete failed! (~p)", [Reason]);
+	    test_server:format(0, "Delete failed! (~tp)", [Reason]);
 	ok ->
 	    ok
     end,
diff --git a/lib/common_test/test/ct_testspec_1_SUITE.erl b/lib/common_test/test/ct_testspec_1_SUITE.erl
index fca5ef3eb3..25e8948145 100644
--- a/lib/common_test/test/ct_testspec_1_SUITE.erl
+++ b/lib/common_test/test/ct_testspec_1_SUITE.erl
@@ -616,7 +616,7 @@ setup_and_execute(TCName, TestSpec, Config) ->
 
     FullSpecFile = ct_test_support:join_abs_dirs(?config(net_dir, Opts),
 						 SpecFile),
-    io:format("~nTest spec created here~n~n<a href=\"file://~s\">~s</a>~n",
+    io:format("~nTest spec created here~n~n<a href=\"file://~ts\">~ts</a>~n",
 	      [FullSpecFile,FullSpecFile]),
 
     ok = ct_test_support:run(Opts, Config),
@@ -638,8 +638,8 @@ setup_and_execute(TCName, TestSpec, Config) ->
 create_spec_file(SpecDir, TCName, TestSpec) ->
     FileName = filename:join(SpecDir,
 			     atom_to_list(TCName)++".spec"),
-    {ok,Dev} = file:open(FileName, [write]),
-    [io:format(Dev, "~p.~n", [Term]) || Term <- TestSpec],
+    {ok,Dev} = file:open(FileName, [write,{encoding,utf8}]),
+    [io:format(Dev, "~tp.~n", [Term]) || Term <- TestSpec],
     file:close(Dev),
     FileName.
 
diff --git a/lib/common_test/test/ct_unicode_SUITE.erl b/lib/common_test/test/ct_unicode_SUITE.erl
new file mode 100644
index 0000000000..84f93a9d0c
--- /dev/null
+++ b/lib/common_test/test/ct_unicode_SUITE.erl
@@ -0,0 +1,218 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_unicode_SUITE
+%%%
+%%% Description:
+%%% Test that common_test handles and logs unicode strings and atoms
+%%% correctly.
+%%%
+%%% The suite used for the test is located in the data directory.
+%%%-------------------------------------------------------------------
+-module(ct_unicode_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% there will be clashes with logging processes etc).
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    case file:native_name_encoding() of
+        latin1 -> {skip,"Test is not applicable on latin1 file system"};
+        _ ->
+            ct_test_support:init_per_suite([{printable_range,unicode}|Config])
+    end.
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [].
+
+all() ->
+    [unicode_atoms_SUITE,
+     unicode_spec].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+unicode_atoms_SUITE(Config) ->
+    DataDir = ?config(data_dir,Config),
+    PrivDir = ?config(priv_dir,Config),
+    run_test(unicode_atoms_SUITE,
+             [{dir,DataDir},{suite,unicode_atoms_SUITE}], Config).
+
+unicode_spec(Config) ->
+    DataDir = ?config(data_dir,Config),
+    PrivDir = ?config(priv_dir,Config),
+    CfgName = "unicode_αβ.cfg",
+    Cfg = io_lib:format("{~tw,[{~tw,\"~ts\"}]}.~n",
+                        ['key_αβ','subkey_αβ',"value_αβ"]),
+    ok = file:write_file(filename:join(PrivDir,CfgName),
+                         unicode:characters_to_binary(Cfg)),
+    TestSpec = [{cases, DataDir, unicode_atoms_SUITE, ['config_αβ']},
+                {config, PrivDir, CfgName}],
+    TestSpecName = ct_test_support:write_testspec(TestSpec, PrivDir,
+                                                  "unicode_αβ.spec"),
+    run_test(unicode_spec,[{spec,TestSpecName}],Config).
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+run_test(Label, Test, Config) ->
+    {Opts,ERPid} = setup_env([{label,Label}|Test], Config),
+    ok = ct_test_support:run(Opts, Config),
+    TestEvents = ct_test_support:get_events(ERPid, Config),
+    ct_test_support:log_events(Label,
+			       reformat_events(TestEvents, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+    ExpEvents = events_to_check(Label),
+    ok = ct_test_support:verify_events(ExpEvents, TestEvents, Config),
+    check_logs([_,_]=get_log_dirs(TestEvents)).
+
+setup_env(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}} | Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+reformat_events(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+get_log_dirs([{?eh,#event{name=start_logging,data=LogDir}}|Events]) ->
+    [LogDir|get_log_dirs(Events)];
+get_log_dirs([_|Events]) ->
+    get_log_dirs(Events);
+get_log_dirs([]) ->
+    [].
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+events_to_check(Test) ->
+    %% 2 tests (ct:run_test + script_start) is default
+    events_to_check(Test, 2).
+
+events_to_check(_, 0) ->
+    [];
+events_to_check(Test, N) ->
+    test_events(Test) ++ events_to_check(Test, N-1).
+
+test_events(unicode_atoms_SUITE) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,6}},
+     {?eh,tc_start,{unicode_atoms_SUITE,init_per_suite}},
+     {?eh,tc_done,{unicode_atoms_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{unicode_atoms_SUITE,'test_αβ'}},
+     {?eh,tc_done,{unicode_atoms_SUITE,'test_αβ',ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{unicode_atoms_SUITE,'fail_αβ_1'}},
+     {?eh,tc_done,{unicode_atoms_SUITE,'fail_αβ_1','_'}},
+     {?eh,test_stats,{1,1,{0,0}}},
+     {?eh,tc_start,{unicode_atoms_SUITE,'fail_αβ_2'}},
+     {?eh,tc_done,{unicode_atoms_SUITE,'fail_αβ_2','_'}},
+     {?eh,test_stats,{1,2,{0,0}}},
+     {?eh,tc_start,{unicode_atoms_SUITE,'fail_αβ_3'}},
+     {?eh,tc_done,{unicode_atoms_SUITE,'fail_αβ_3','_'}},
+     {?eh,test_stats,{1,3,{0,0}}},
+     {?eh,tc_start,{unicode_atoms_SUITE,'fail_αβ_4'}},
+     {?eh,tc_done,{unicode_atoms_SUITE,'fail_αβ_4','_'}},
+     {?eh,test_stats,{1,4,{0,0}}},
+     {?eh,tc_start,{unicode_atoms_SUITE,'skip_αβ'}},
+     {?eh,tc_done,{unicode_atoms_SUITE,'skip_αβ','_'}},
+     {?eh,test_stats,{1,4,{1,0}}},
+     {?eh,tc_start,{unicode_atoms_SUITE,end_per_suite}},
+     {?eh,tc_done,{unicode_atoms_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+test_events(unicode_spec) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,1}},
+     {?eh,tc_start,{unicode_atoms_SUITE,init_per_suite}},
+     {?eh,tc_done,{unicode_atoms_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{unicode_atoms_SUITE,'config_αβ'}},
+     {?eh,tc_done,{unicode_atoms_SUITE,'config_αβ',ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{unicode_atoms_SUITE,end_per_suite}},
+     {?eh,tc_done,{unicode_atoms_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ].
+
+%%%-----------------------------------------------------------------
+%%% Check logs for escaped unicode characters
+check_logs(Dirs) ->
+    ct:log("Checking logs for escaped unicode characters (αβ).~nDirs:~n~tp",
+           [Dirs]),
+    {ok,RE} = re:compile(<<"x{3B[12]}"/utf8>>),
+    case check_logs1(RE,Dirs,[]) of
+        [] ->
+            ok;
+        Match ->
+            MatchStr = string:join(Match,"\n"),
+            ct:log("ERROR: Escaped unicode characters found in:~n~ts",[MatchStr]),
+            ct:fail(escaped_unicode_characters_found)
+    end.
+
+check_logs1(RE,[F|Fs],Match) ->
+    New = case filelib:is_dir(F) of
+              true ->
+                  {ok,Files} = file:list_dir(F),
+                  check_logs1(RE,[filename:join(F,File)||File<-Files],[]);
+              false ->
+                  check_log(RE,F)
+          end,
+    check_logs1(RE,Fs,New++Match);
+check_logs1(_RE,[],Match) ->
+    Match.
+
+check_log(RE,F) ->
+    {ok,Bin} = file:read_file(F),
+    case re:run(Bin,RE,[{capture,none}]) of
+        match ->
+            [F];
+        nomatch ->
+            []
+    end.
diff --git a/lib/common_test/test/ct_unicode_SUITE_data/unicode_atoms_SUITE.erl b/lib/common_test/test/ct_unicode_SUITE_data/unicode_atoms_SUITE.erl
new file mode 100644
index 0000000000..d4dfdc23ac
--- /dev/null
+++ b/lib/common_test/test/ct_unicode_SUITE_data/unicode_atoms_SUITE.erl
@@ -0,0 +1,98 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(unicode_atoms_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+suite() ->
+    [{timetrap,{seconds,30}}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+groups() ->
+    [].
+
+all() ->
+    ['test_αβ',
+     'fail_αβ_1',
+     'fail_αβ_2',
+     'fail_αβ_3',
+     'fail_αβ_4',
+     'skip_αβ'].
+
+'test_αβ'(_Config) ->
+    ct:log("This is test case ~tw",[?FUNCTION_NAME]),
+    ok.
+
+'fail_αβ_1'(_Config) ->
+    ct:log("This is test case ~tw",[?FUNCTION_NAME]),
+    'α' = 'β',
+    ok.
+
+'fail_αβ_2'(_Config) ->
+    ct:log("This is test case ~tw",[?FUNCTION_NAME]),
+    ct:fail({failing,testcase,?FUNCTION_NAME}),
+    ok.
+
+'fail_αβ_3'(_Config) ->
+    ct:log("This is test case ~tw",[?FUNCTION_NAME]),
+    exit({exiting,testcase,?FUNCTION_NAME}),
+    ok.
+
+'fail_αβ_4'(_Config) ->
+    ct:log("This is test case ~tw",[?FUNCTION_NAME]),
+    S = try throw(ok) catch throw:ok -> erlang:get_stacktrace() end,
+    erlang:raise(error,{error,testcase,?FUNCTION_NAME},S),
+    ok.
+
+'skip_αβ'(_Config) ->
+    ct:log("This is test case ~tw",[?FUNCTION_NAME]),
+    {skip,"Skipping " ++ atom_to_list(?FUNCTION_NAME)}.
+
+
+%% This should not be listed in all/0. It is only to be run explicitly
+%% using a test spec where the config file is declared as well.
+'config_αβ'() ->
+    [{require,'alias_αβ','key_αβ'}].
+'config_αβ'(_Config) ->
+    ct:log("This is test case ~tw",[?FUNCTION_NAME]),
+    Conf = ct:get_config('alias_αβ'),
+    Conf = ct:get_config('key_αβ'),
+    ct:log("Required config: ~tp",[Conf]),
+    ok.
diff --git a/lib/common_test/test/ct_verbosity_SUITE.erl b/lib/common_test/test/ct_verbosity_SUITE.erl
index b9298e54ca..4dbefabd0d 100644
--- a/lib/common_test/test/ct_verbosity_SUITE.erl
+++ b/lib/common_test/test/ct_verbosity_SUITE.erl
@@ -47,8 +47,8 @@
 init_per_suite(Config) ->
     DataDir = ?config(data_dir, Config),
     EvH = filename:join(DataDir,"simple_evh.erl"),
-    ct:pal("Compiling ~s: ~p", [EvH,compile:file(EvH,[{outdir,DataDir},
-						      debug_info])]),
+    ct:pal("Compiling ~ts: ~p", [EvH,compile:file(EvH,[{outdir,DataDir},
+                                                       debug_info])]),
     ct_test_support:init_per_suite([{path_dirs,[DataDir]} | Config]).
 
 end_per_suite(Config) ->
diff --git a/lib/common_test/test/erl2html2_SUITE.erl b/lib/common_test/test/erl2html2_SUITE.erl
index bdce43c9c9..3a0af14da2 100644
--- a/lib/common_test/test/erl2html2_SUITE.erl
+++ b/lib/common_test/test/erl2html2_SUITE.erl
@@ -163,9 +163,9 @@ convert_module(Mod,InclDirs,Config) ->
     PrivDir = ?config(priv_dir,Config),
     Src = filename:join(DataDir,Mod++".erl"),
     Dst = filename:join(PrivDir,Mod++".erl.html"),
-    io:format("<a href=\"~s\">~s</a>\n",[Src,filename:basename(Src)]),
+    io:format("<a href=\"~ts\">~s</a>\n",[Src,filename:basename(Src)]),
     ok = erl2html2:convert(Src, Dst, InclDirs, "<html><body>"),
-    io:format("<a href=\"~s\">~s</a>\n",[Dst,filename:basename(Dst)]),
+    io:format("<a href=\"~ts\">~s</a>\n",[Dst,filename:basename(Dst)]),
     {Src,Dst}.
 
 %% Check that there are the same number of lines in each file, and
diff --git a/lib/common_test/test/test_server_test_lib.erl b/lib/common_test/test/test_server_test_lib.erl
index cf5951ae03..6c8e98bd12 100644
--- a/lib/common_test/test/test_server_test_lib.erl
+++ b/lib/common_test/test/test_server_test_lib.erl
@@ -81,7 +81,7 @@ prepare_tester_node(Node,Config) ->
     [true = rpc:call(Node, code, add_patha, [D]) || D <- PathDirs],
     io:format("Dirs added to code path (on ~w):~n",
 	      [Node]),
-    [io:format("~s~n", [D]) || D <- PathDirs],
+    [io:format("~ts~n", [D]) || D <- PathDirs],
 
     true = rpc:call(Node, os, putenv,
 		    ["TEST_SERVER_FRAMEWORK", "undefined"]),