diff options
| author | Peter Andersson <[email protected]> | 2012-03-13 10:55:06 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-03-13 10:55:23 +0100 |
| commit | e420e3347da7abcd17734c6ab39b2fe8889b3205 (patch) | |
| tree | 2f1e94cc3d4dde5da9f24f02c2accc95e73923d1 /lib/test_server | |
| parent | 774be3d0e3cf19f877bf00c3adb7f2389cc0dc37 (diff) | |
| parent | 5e282d9ba621008355fbd9a9ff27310577404b98 (diff) | |
| download | otp-e420e3347da7abcd17734c6ab39b2fe8889b3205.tar.gz otp-e420e3347da7abcd17734c6ab39b2fe8889b3205.tar.bz2 otp-e420e3347da7abcd17734c6ab39b2fe8889b3205.zip | |
Merge remote branch 'origin/peppe/common_test/otp-9904_9900' into maint
* origin/peppe/common_test/otp-9904_9900:
Introduce error notification printout in the tc log
OTP-9904
OTP-9900
Diffstat (limited to 'lib/test_server')
| -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 8ba6728f5d..08197ee36e 100644 --- a/lib/test_server/src/test_server.erl +++ b/lib/test_server/src/test_server.erl @@ -1601,13 +1601,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. |