diff options
| author | Lukas Larsson <[email protected]> | 2017-09-12 10:01:15 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-09-12 10:01:15 +0200 |
| commit | c22e19bf3b5f735fb9007c07cfd6251a61d3d492 (patch) | |
| tree | 3b2f58b9e860a86d11ba9869f992e052893fb115 /lib/common_test | |
| parent | 39c3d2ed3f6f7c15e7f726f0cb444d2b79775146 (diff) | |
| parent | 18fb1a9230578456f3d03b4136ed296407bdf53c (diff) | |
| download | otp-c22e19bf3b5f735fb9007c07cfd6251a61d3d492.tar.gz otp-c22e19bf3b5f735fb9007c07cfd6251a61d3d492.tar.bz2 otp-c22e19bf3b5f735fb9007c07cfd6251a61d3d492.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test')
| -rw-r--r-- | lib/common_test/test_server/ts_lib.erl | 24 | ||||
| -rw-r--r-- | lib/common_test/test_server/ts_run.erl | 7 |
2 files changed, 29 insertions, 2 deletions
diff --git a/lib/common_test/test_server/ts_lib.erl b/lib/common_test/test_server/ts_lib.erl index a7be740c5c..ea039a2c2b 100644 --- a/lib/common_test/test_server/ts_lib.erl +++ b/lib/common_test/test_server/ts_lib.erl @@ -120,7 +120,8 @@ specs(Dir) -> [] end end, Specs), - sort_tests(MainSpecs). + + sort_tests(filter_tests(MainSpecs)). test_categories(Dir, App) -> Specs = filelib:wildcard(filename:join([filename:dirname(Dir), @@ -141,10 +142,29 @@ suites(Dir, App) -> "*_SUITE.erl"]), Suites=filelib:wildcard(Glob), [filename_to_atom(Name) || Name <- Suites]. - + filename_to_atom(Name) -> list_to_atom(filename:rootname(filename:basename(Name))). +%% Filter out tests of applications that are not accessible + +filter_tests(Tests) -> + lists:filter( + fun(Special) when Special == epmd; + Special == emulator; + Special == system -> + true; + (Test) -> + case application:load(filename_to_atom(Test)) of + {error, {already_loaded, _}} -> + true; + {error,_NoSuchApplication} -> + false; + _ -> + true + end + end, Tests). + %% Sorts a list of either log files directories or spec files. sort_tests(Tests) -> diff --git a/lib/common_test/test_server/ts_run.erl b/lib/common_test/test_server/ts_run.erl index ec4a54b249..2736010551 100644 --- a/lib/common_test/test_server/ts_run.erl +++ b/lib/common_test/test_server/ts_run.erl @@ -96,6 +96,9 @@ ct_run_test(Dir, CommonTestArgs) -> case ct:run_test(CommonTestArgs) of {_,_,_} -> ok; + {error,{make_failed, _Modules} = Error} -> + io:format("ERROR: ~P\n", [Error,20]), + erlang:halt(123, [{flush,false}]); {error,Error} -> io:format("ERROR: ~P\n", [Error,20]); Other -> @@ -284,6 +287,10 @@ tricky_print_data(Port, Timeout) -> receive {Port, {exit_status, 0}} -> ok; + {Port, {exit_status, 123 = N}} -> + io:format(user, "Test run exited with status ~p," + "aborting rest of test~n", [N]), + erlang:halt(123, [{flush,false}]); {Port, {exit_status, N}} -> io:format(user, "Test run exited with status ~p~n", [N]) after 1 -> |