diff options
| author | Peter Andersson <[email protected]> | 2011-07-13 18:17:36 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2011-09-23 12:24:54 +0200 |
| commit | f703d6512219431fa7fe61e5ddd1a9ed32506daa (patch) | |
| tree | 6df2157019b840d8a1e2c0b1ef7ddb20b2a6daea /lib/common_test/src/ct_run.erl | |
| parent | d3b636f97ce36e106ac53beb4cba0db13cd5656f (diff) | |
| download | otp-f703d6512219431fa7fe61e5ddd1a9ed32506daa.tar.gz otp-f703d6512219431fa7fe61e5ddd1a9ed32506daa.tar.bz2 otp-f703d6512219431fa7fe61e5ddd1a9ed32506daa.zip | |
Fix problem with logdir string and some other minor bugs
OTP-9370: Fix problem with crash if logdir contains multiple dirs
OTP-9155: Fix some minor remaining bugs
Diffstat (limited to 'lib/common_test/src/ct_run.erl')
| -rw-r--r-- | lib/common_test/src/ct_run.erl | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl index 00b5a53cf4..418e212fd1 100644 --- a/lib/common_test/src/ct_run.erl +++ b/lib/common_test/src/ct_run.erl @@ -157,6 +157,7 @@ script_start(Args) -> end, stop_trace(Tracing), timer:sleep(1000), + io:nl(), Res. script_start1(Parent, Args) -> @@ -2155,6 +2156,18 @@ get_start_opt(Key, IfExists, Args) -> get_start_opt(Key, IfExists, undefined, Args). get_start_opt(Key, IfExists, IfNotExists, Args) -> + try try_get_start_opt(Key, IfExists, IfNotExists, Args) of + Result -> + Result + catch + error:_ -> + exit({user_error,{bad_argument,Key}}) + end. + +try_get_start_opt(Key, IfExists, Args) -> + try_get_start_opt(Key, IfExists, undefined, Args). + +try_get_start_opt(Key, IfExists, IfNotExists, Args) -> case lists:keysearch(Key, 1, Args) of {value,{Key,Val}} when is_function(IfExists) -> IfExists(Val); |