diff options
| author | Lukas Larsson <[email protected]> | 2013-06-03 17:36:40 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-06-03 17:36:40 +0200 |
| commit | 8bd1897dac5e2774a6fce56de61b169bd7267bbf (patch) | |
| tree | 79e0f90f0974a503e1742d8709b39b75baa3a581 /lib/test_server | |
| parent | 2e0edbce734dbc684abbe7d415b4e94603a45846 (diff) | |
| parent | 6906875260e2b70d3fd405f3eb6eab625814d105 (diff) | |
| download | otp-8bd1897dac5e2774a6fce56de61b169bd7267bbf.tar.gz otp-8bd1897dac5e2774a6fce56de61b169bd7267bbf.tar.bz2 otp-8bd1897dac5e2774a6fce56de61b169bd7267bbf.zip | |
Merge branch 'maint'
* maint:
Do not fail if there is no variables file
Run iter max ports on a seperate vm with smaller port table
Set max ports for slave node
Decrease sleep timer
Diffstat (limited to 'lib/test_server')
| -rw-r--r-- | lib/test_server/src/ts_install_cth.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/test_server/src/ts_install_cth.erl b/lib/test_server/src/ts_install_cth.erl index 9b6e10e7e2..a75cae3c9d 100644 --- a/lib/test_server/src/ts_install_cth.erl +++ b/lib/test_server/src/ts_install_cth.erl @@ -103,7 +103,9 @@ pre_init_per_suite(_Suite,Config,State) -> end, {add_node_name(Config, State), State} - catch Error:Reason -> + catch error:{badmatch,{error,enoent}} -> + {add_node_name(Config, State), State}; + Error:Reason -> Stack = erlang:get_stacktrace(), ct:pal("~p failed! ~p:{~p,~p}",[?MODULE,Error,Reason,Stack]), {{fail,{?MODULE,{Error,Reason, Stack}}},State} |