diff options
author | Peter Andersson <[email protected]> | 2012-03-11 23:54:03 +0100 |
---|---|---|
committer | Peter Andersson <[email protected]> | 2012-03-11 23:54:03 +0100 |
commit | 5e282d9ba621008355fbd9a9ff27310577404b98 (patch) | |
tree | d19298680d47f2df9ceb7e982720a6ce6ee93381 /lib/test_server/src/test_server.erl | |
parent | bcf19f1d079720272198ba1a6b36a8718e6f2303 (diff) | |
download | otp-5e282d9ba621008355fbd9a9ff27310577404b98.tar.gz otp-5e282d9ba621008355fbd9a9ff27310577404b98.tar.bz2 otp-5e282d9ba621008355fbd9a9ff27310577404b98.zip |
Introduce error notification printout in the tc log
Also fix problem with parallel test cases printing "into each other"
(when using ct:print or ct:pal).
OTP-9904
OTP-9900
Diffstat (limited to 'lib/test_server/src/test_server.erl')
-rw-r--r-- | lib/test_server/src/test_server.erl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl index 1433eef193..9bcba9e869 100644 --- a/lib/test_server/src/test_server.erl +++ b/lib/test_server/src/test_server.erl @@ -1594,13 +1594,20 @@ mod_loc(Loc) -> %% handle diff line num versions case Loc of [{{_M,_F},_L}|_] -> - [{?pl2a(M),F,L} || {{M,F},L} <- Loc]; + [begin if L /= 0 -> {?pl2a(M),F,L}; + true -> {?pl2a(M),F} end end || {{M,F},L} <- Loc]; [{_M,_F}|_] -> [{?pl2a(M),F} || {M,F} <- Loc]; + {{M,F},0} -> + [{?pl2a(M),F}]; {{M,F},L} -> [{?pl2a(M),F,L}]; {M,ForL} -> [{?pl2a(M),ForL}]; + {M,F,0} -> + [{M,F}]; + [{M,F,0}|Stack] -> + [{M,F}|Stack]; _ -> Loc end. |