diff options
| author | Erlang/OTP <[email protected]> | 2014-02-05 13:56:18 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2014-02-05 13:56:18 +0100 |
| commit | 5f30912275c02e06de2a03e5b03c64b919c5a048 (patch) | |
| tree | b8a716cc5cbf9f68d6a7a6a71cd57d7ff7a4c2d8 /lib/inets/test/ftp_SUITE_data/ftpd_hosts.skel | |
| parent | 28eb7e0a25aed6153433ab3e93f023b194d0d858 (diff) | |
| parent | 6a6653e1fa03d105fa66da54f7291dd592e6f203 (diff) | |
| download | otp-5f30912275c02e06de2a03e5b03c64b919c5a048.tar.gz otp-5f30912275c02e06de2a03e5b03c64b919c5a048.tar.bz2 otp-5f30912275c02e06de2a03e5b03c64b919c5a048.zip | |
Merge branch 'ia/R15B03/inets-5.9.8' into maint-r15
* refs/heads/fetch-and-merge.maint-r15-opu/FETCH_HEAD/11632: (73 commits)
Changed to correct errorcode in testcase
inets: Prepare for release
inets: Make test suites independent of each other
inets: Rewrite of test case to avoid timing issues in test code
Add missing brackets to report formatting on ftp_progress process exit
inets: Remove log message as it causes more harm than use at the moment
inets: Mend broken max_clients check
inets: Start CT'ify httpd_SUITE
inets: Remove use of default gen_server timeout
Fix http_request:http_headers/1 to send content-length when length is zero
Fix httpd config option 'keep_alive_timeout'
Fix httpd config option 'script_timeout'
inets: Restore ftp test files for the inets_{,sup_}SUITE to not fail
inets: Add crypto start check to ssl test cases
ftp: fix sockname dialyzer warning including ftp:sockname/1 bug
ftp,ssl: Fixes broken type link (ssloption).
ftp: Adds dynamic cert generation to tests.
ftp: Clean Makefile and conf file
ftp: Linking rfc-refs.
ftp: Add documentation.
...
Diffstat (limited to 'lib/inets/test/ftp_SUITE_data/ftpd_hosts.skel')
| -rw-r--r-- | lib/inets/test/ftp_SUITE_data/ftpd_hosts.skel | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/inets/test/ftp_SUITE_data/ftpd_hosts.skel b/lib/inets/test/ftp_SUITE_data/ftpd_hosts.skel index 75096ce687..98dff81881 100644 --- a/lib/inets/test/ftp_SUITE_data/ftpd_hosts.skel +++ b/lib/inets/test/ftp_SUITE_data/ftpd_hosts.skel @@ -1,13 +1,13 @@ %% Add a host name in the appropriate list -%% Each "platform" contains a list of hostnames (a string) that can +%% Each "platform" contains a list of hostnames (a string) that can %% be used for testing the ftp client. %% The definition below are an example!! -[{solaris8_sparc, ["solaris8_sparc_dummy1", "solaris8_sparc_dummy2"]}, - {solaris9_sparc, ["solaris9_sparc_dummy1"]}, - {solaris10_sparc, ["solaris10_sparc_dummy1"]}, - {solaris10_x86, ["solaris10_x86_dummy1", "solaris10_x86_dummy2"]}, - {linux_x86, ["linux_x86_dummy1", "linux_x86_dummy2"]}, - {linux_ppc, ["linux_ppc_dummy1"]}, +[{solaris8_sparc, ["solaris8_sparc_dummy1", "solaris8_sparc_dummy2"]}, + {solaris9_sparc, ["solaris9_sparc_dummy1"]}, + {solaris10_sparc, ["solaris10_sparc_dummy1"]}, + {solaris10_x86, ["solaris10_x86_dummy1", "solaris10_x86_dummy2"]}, + {linux_x86, ["linux_x86_dummy1", "linux_x86_dummy2"]}, + {linux_ppc, ["linux_ppc_dummy1"]}, {macosx_ppc, ["macosx_ppc_dummy1"]}, {macosx_x86, ["macosx_x86_dummy1", "macosx_x86_dummy2"]}, {openbsd_x86, []}, |