aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src/ct_run.erl
diff options
context:
space:
mode:
authorPeter Andersson <peppe@erlang.org>2012-08-23 17:23:08 +0200
committerPeter Andersson <peppe@erlang.org>2012-08-23 17:23:08 +0200
commitc9b4ce74e68d25b762a22facdbfe8ab1b078815a (patch)
treea551663d2db938586272f0dbf6d2a86bab7f6f56 /lib/common_test/src/ct_run.erl
parentada34eeaa3e7f034a3c69ccc95e1bcf2226cb7eb (diff)
downloadotp-c9b4ce74e68d25b762a22facdbfe8ab1b078815a.tar.gz
otp-c9b4ce74e68d25b762a22facdbfe8ab1b078815a.tar.bz2
otp-c9b4ce74e68d25b762a22facdbfe8ab1b078815a.zip
Fix IO bug causing CT Hooks to hang at startup
Diffstat (limited to 'lib/common_test/src/ct_run.erl')
-rw-r--r--lib/common_test/src/ct_run.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index 1dbd9973cf..a202ca15e2 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -1114,7 +1114,7 @@ run_spec_file(Relaxed,
end.
run_prepared(Run, Skip, Opts = #opts{logdir = LogDir,
- config = CfgFiles },
+ config = CfgFiles},
StartOpts) ->
LogDir1 = which(logdir, LogDir),
case check_and_install_configfiles(CfgFiles, LogDir1, Opts) of
@@ -1619,7 +1619,8 @@ do_run(Tests, Skip, Opts, Args) when is_record(Opts, opts) ->
"run ct:start_interactive()\n\n",[]),
{error,interactive_mode};
_Pid ->
- compile_and_run(Tests, Skip, Opts1, Args)
+ compile_and_run(Tests, Skip,
+ Opts1#opts{verbosity=Verbosity}, Args)
end
end.
@@ -1786,7 +1787,6 @@ verify_suites(TestSuites) ->
Beam = filename:join(TestDir,
atom_to_list(Suite)++
".beam"),
-
case filelib:is_regular(Beam) of
true ->
{[DS|Found],NotFound};