diff options
author | Dan Gudmundsson <[email protected]> | 2014-01-22 10:10:44 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2014-01-22 10:10:44 +0100 |
commit | d203887853971d58a4054400a88f91bbf73b19c8 (patch) | |
tree | 7b442151bd7b6f37119096913d90f72437db0510 /lib/test_server/src/ts_run.erl | |
parent | 1f7e86af8b3f489253c06b2043440c11168a4654 (diff) | |
parent | c0d320e028ce4a4b6af99ad5e20dee8ea95d6fce (diff) | |
download | otp-d203887853971d58a4054400a88f91bbf73b19c8.tar.gz otp-d203887853971d58a4054400a88f91bbf73b19c8.tar.bz2 otp-d203887853971d58a4054400a88f91bbf73b19c8.zip |
Merge branch 'dgud/test_unicode/OTP-10877'
* dgud/test_unicode/OTP-10877:
sasl test: Quote executable paths (can contain spaces)
rt_tools: Handle unicode chars in printouts
kernel: code_SUITE fix unicode option
Fix (unicode) debug info in test cases
stdlib: Fix format if module resides in a unicode directory
Fix testing with unicode paths
test_server: Fix ts write unicode in config files
Diffstat (limited to 'lib/test_server/src/ts_run.erl')
-rw-r--r-- | lib/test_server/src/ts_run.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/test_server/src/ts_run.erl b/lib/test_server/src/ts_run.erl index 60c9a7a4b7..d96abfc55a 100644 --- a/lib/test_server/src/ts_run.erl +++ b/lib/test_server/src/ts_run.erl @@ -224,7 +224,7 @@ make_command(Vars, Spec, State) -> CrashFile = filename:join(Cwd,State#state.file ++ "_erl_crash.dump"), case filelib:is_file(CrashFile) of true -> - io:format("ts_run: Deleting dump: ~s\n",[CrashFile]), + io:format("ts_run: Deleting dump: ~ts\n",[CrashFile]), file:delete(CrashFile); false -> ok @@ -258,8 +258,8 @@ make_command(Vars, Spec, State) -> run_batch(Vars, _Spec, State) -> process_flag(trap_exit, true), Command = State#state.command ++ " -noinput -s erlang halt", - ts_lib:progress(Vars, 1, "Command: ~s~n", [Command]), - io:format(user, "Command: ~s~n",[Command]), + ts_lib:progress(Vars, 1, "Command: ~ts~n", [Command]), + io:format(user, "Command: ~ts~n",[Command]), Port = open_port({spawn, Command}, [stream, in, eof]), Timeout = 30000 * case os:getenv("TS_RUN_VALGRIND") of false -> 1; |