diff options
Diffstat (limited to 'lib')
| -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, 1 insertions, 6 deletions
diff --git a/lib/common_test/test_server/ts_install_cth.erl b/lib/common_test/test_server/ts_install_cth.erl index 5e284b1cdc..b6503fb864 100644 --- a/lib/common_test/test_server/ts_install_cth.erl +++ b/lib/common_test/test_server/ts_install_cth.erl @@ -108,11 +108,7 @@ 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:{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 -> + 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 84ca87a626..7e12b9652c 100644 --- a/lib/common_test/test_server/ts_run.erl +++ b/lib/common_test/test_server/ts_run.erl @@ -247,7 +247,6 @@ 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)),")\"" |