From c9b4ce74e68d25b762a22facdbfe8ab1b078815a Mon Sep 17 00:00:00 2001 From: Peter Andersson Date: Thu, 23 Aug 2012 17:23:08 +0200 Subject: Fix IO bug causing CT Hooks to hang at startup --- lib/common_test/src/ct_run.erl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/common_test/src/ct_run.erl') 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}; -- cgit v1.2.3