diff options
| author | Lukas Larsson <[email protected]> | 2019-03-18 15:06:36 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-03-25 16:34:11 +0100 |
| commit | 3379747ece9a9d87ddb29dff5bf2a9b6e9b1cd9d (patch) | |
| tree | 91f1b360d7c8e6bd69001cf5ea22f436559e5599 /lib/common_test/test_server | |
| parent | 043d9e406fc0ffae447b245b853014c7c739b31d (diff) | |
| download | otp-3379747ece9a9d87ddb29dff5bf2a9b6e9b1cd9d.tar.gz otp-3379747ece9a9d87ddb29dff5bf2a9b6e9b1cd9d.tar.bz2 otp-3379747ece9a9d87ddb29dff5bf2a9b6e9b1cd9d.zip | |
erts: Always run fds check after each testcase
Diffstat (limited to 'lib/common_test/test_server')
| -rw-r--r-- | lib/common_test/test_server/ts_install_cth.erl | 6 | ||||
| -rw-r--r-- | lib/common_test/test_server/ts_run.erl | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/common_test/test_server/ts_install_cth.erl b/lib/common_test/test_server/ts_install_cth.erl index b6503fb864..5e284b1cdc 100644 --- a/lib/common_test/test_server/ts_install_cth.erl +++ b/lib/common_test/test_server/ts_install_cth.erl @@ -108,7 +108,11 @@ pre_init_per_suite(_Suite,Config,State) -> {add_node_name(Config, State), State} catch error:{badmatch,{error,enoent}} -> {add_node_name(Config, State), State}; - Error:Reason:Stack -> + error:{badmatch,{error,emfile}}=Reason:Stack -> + FDInfo = os:cmd("cat /proc/"++ os:getpid() ++"/fdinfo/*"), + ct:pal("~p ~s failed! ~p:{~p,~p}",[?MODULE,FDInfo,error,Reason,Stack]), + {{fail,{?MODULE,{error,Reason, Stack}}},State}; + Error:Reason:Stack -> ct:pal("~p failed! ~p:{~p,~p}",[?MODULE,Error,Reason,Stack]), {{fail,{?MODULE,{Error,Reason, Stack}}},State} end. diff --git a/lib/common_test/test_server/ts_run.erl b/lib/common_test/test_server/ts_run.erl index 7e12b9652c..84ca87a626 100644 --- a/lib/common_test/test_server/ts_run.erl +++ b/lib/common_test/test_server/ts_run.erl @@ -247,6 +247,7 @@ make_command(Vars, Spec, State) -> %% " -test_server_format_exception false", " -boot start_sasl -sasl errlog_type error", " -pz \"",Cwd,"\"", + " -pz \"",TestDir,"\"", " -ct_test_vars ",TestVars, " -eval \"ts_run:ct_run_test(\\\"",TestDir,"\\\", ", backslashify(lists:flatten(State#state.test_server_args)),")\"" |