diff options
| author | Peter Andersson <[email protected]> | 2013-02-19 14:12:03 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2013-02-19 14:12:09 +0100 |
| commit | df2b8d69d2abf071f4753da75e296e06859b5749 (patch) | |
| tree | 55dca8ebc4cc30ae74c76d9dbd2cbc81ffd408a4 /lib/common_test/src/ct_logs.erl | |
| parent | e33534c42319768c7de5cc8b081c21eca134aed1 (diff) | |
| parent | 0164fa89fcf83cef70e1f5228fa66b43105c07aa (diff) | |
| download | otp-df2b8d69d2abf071f4753da75e296e06859b5749.tar.gz otp-df2b8d69d2abf071f4753da75e296e06859b5749.tar.bz2 otp-df2b8d69d2abf071f4753da75e296e06859b5749.zip | |
Merge remote branch 'origin/peppe/common_test/tc_print_deadlock'
* origin/peppe/common_test/tc_print_deadlock:
Fix problems with verbosity test suite
Solve problem with IO deadlock in ct_util_server
Implement test case that triggers known deadlock bug
OTP-10826
Diffstat (limited to 'lib/common_test/src/ct_logs.erl')
| -rw-r--r-- | lib/common_test/src/ct_logs.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl index 5924930072..be52be6bf3 100644 --- a/lib/common_test/src/ct_logs.erl +++ b/lib/common_test/src/ct_logs.erl @@ -397,9 +397,9 @@ tc_print(Category,Format,Args) -> %%% <p>This function is called by <code>ct</code> when printing %%% stuff from a testcase on the user console.</p> tc_print(Category,Importance,Format,Args) -> - VLvl = case ct_util:get_testdata({verbosity,Category}) of + VLvl = case ct_util:get_verbosity(Category) of undefined -> - ct_util:get_testdata({verbosity,'$unspecified'}); + ct_util:get_verbosity('$unspecified'); {error,bad_invocation} -> ?MAX_VERBOSITY; Val -> |