diff options
| author | Peter Andersson <[email protected]> | 2013-06-05 16:20:50 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2013-06-05 16:21:12 +0200 |
| commit | 2d0ef0bfb0cef18d368d9fe7518daa0360f9ad27 (patch) | |
| tree | 970aa2507d887e5ca44ac828b9a9e86d724c24d6 /lib/common_test/src/ct_run.erl | |
| parent | 5968b8e07453c8a34d4fe2c4a57f66d3ecb6c628 (diff) | |
| parent | 0681d5fa0b41210a114df57faabcd84fa7bc7e01 (diff) | |
| download | otp-2d0ef0bfb0cef18d368d9fe7518daa0360f9ad27.tar.gz otp-2d0ef0bfb0cef18d368d9fe7518daa0360f9ad27.tar.bz2 otp-2d0ef0bfb0cef18d368d9fe7518daa0360f9ad27.zip | |
Merge branch 'peppe/common_test/ct_testspec_verification.2' into maint
* peppe/common_test/ct_testspec_verification.2:
Fix error with testspec terms not being merged properly
Fix problem with tests being wrongly added to separate specs
Improve error report if crash due to bad testspec
Add verification terms for test specification tests
OTP-10857
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. |