diff options
author | Peter Andersson <[email protected]> | 2013-06-05 16:23:19 +0200 |
---|---|---|
committer | Peter Andersson <[email protected]> | 2013-06-05 16:23:19 +0200 |
commit | 0e834fdf2cdc7e0f67f0762afe364f375aac547f (patch) | |
tree | 95c054861180c99b32263f26ee859e3f385c05f4 /lib/common_test/src/ct_run.erl | |
parent | a617d1665e33c2a622fe1f426566a40cd2c6556e (diff) | |
parent | 2d0ef0bfb0cef18d368d9fe7518daa0360f9ad27 (diff) | |
download | otp-0e834fdf2cdc7e0f67f0762afe364f375aac547f.tar.gz otp-0e834fdf2cdc7e0f67f0762afe364f375aac547f.tar.bz2 otp-0e834fdf2cdc7e0f67f0762afe364f375aac547f.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src/ct_run.erl')
-rw-r--r-- | lib/common_test/src/ct_run.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl index 41d53c7b43..266ca73417 100644 --- a/lib/common_test/src/ct_run.erl +++ b/lib/common_test/src/ct_run.erl @@ -402,7 +402,8 @@ script_start2(Opts = #opts{vts = undefined, Relaxed = get_start_opt(allow_user_terms, true, false, Args), case catch ct_testspec:collect_tests_from_file(Specs1, Relaxed) of {E,Reason} when E == error ; E == 'EXIT' -> - {error,Reason}; + StackTrace = erlang:get_stacktrace(), + {error,{invalid_testspec,{Reason,StackTrace}}}; TestSpecData -> execute_all_specs(TestSpecData, Opts, Args, []) end; @@ -1101,7 +1102,8 @@ run_spec_file(Relaxed, AbsSpecs1 = get_start_opt(join_specs, [AbsSpecs], AbsSpecs, StartOpts), case catch ct_testspec:collect_tests_from_file(AbsSpecs1, Relaxed) of {Error,CTReason} when Error == error ; Error == 'EXIT' -> - exit({error,CTReason}); + StackTrace = erlang:get_stacktrace(), + exit({error,{invalid_testspec,{CTReason,StackTrace}}}); TestSpecData -> run_all_specs(TestSpecData, Opts, StartOpts, []) end. |