diff options
| author | Lukas Larsson <[email protected]> | 2011-05-09 09:17:55 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-05-09 09:17:55 +0200 |
| commit | 9f66f078bcd5cb4242e22e60242dab12c57cdc47 (patch) | |
| tree | e7397a813fe1f7847804b939ad4af542dbcda026 /lib | |
| parent | 67992620807364ae8a256e63d4804b81afa2c379 (diff) | |
| parent | 1175eb12b4f20bc4532c2e526f4a525241b5180b (diff) | |
| download | otp-9f66f078bcd5cb4242e22e60242dab12c57cdc47.tar.gz otp-9f66f078bcd5cb4242e22e60242dab12c57cdc47.tar.bz2 otp-9f66f078bcd5cb4242e22e60242dab12c57cdc47.zip | |
Merge branch 'lukas/common_test/timeout_location_fix/OTP-9265' into dev
* lukas/common_test/timeout_location_fix/OTP-9265:
Fix ct_framework to not crash when error_notification location is undefined.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common_test/src/ct_framework.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl index c016b9c66b..809616d8e3 100644 --- a/lib/common_test/src/ct_framework.erl +++ b/lib/common_test/src/ct_framework.erl @@ -636,7 +636,7 @@ error_notification(Mod,Func,_Args,{Error,Loc}) -> [{?MODULE,error_in_suite}] -> io:format(user, "Error in suite detected: ~s", [ErrStr]); - unknown -> + R when R == unknown; R == undefined -> io:format(user, "Error detected: ~s", [ErrStr]); %% if a function specified by all/0 does not exist, we |