diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-01-21 15:41:31 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-01-21 15:41:31 +0100 |
| commit | 744984833cc1a51f51781e3417db7f152eeab4ae (patch) | |
| tree | 48a2c08a403d830755e19fc7e2bb452d44f584dd /lib/inets/test/Makefile | |
| parent | 41db1e8520171908b3ebc4ecd1d09d83dd4dc535 (diff) | |
| parent | 44c4ecd8bad76c1ecc2eae2d23ebf212f1c299b9 (diff) | |
| download | otp-744984833cc1a51f51781e3417db7f152eeab4ae.tar.gz otp-744984833cc1a51f51781e3417db7f152eeab4ae.tar.bz2 otp-744984833cc1a51f51781e3417db7f152eeab4ae.zip | |
Merge branch 'ia/inets/httpd-manager-improvments/OTP-11557' into maint
* ia/inets/httpd-manager-improvments/OTP-11557:
inets: Prepare for release
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
Diffstat (limited to 'lib/inets/test/Makefile')
| -rw-r--r-- | lib/inets/test/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/inets/test/Makefile b/lib/inets/test/Makefile index f18db273ec..c156b34406 100644 --- a/lib/inets/test/Makefile +++ b/lib/inets/test/Makefile @@ -158,12 +158,14 @@ MODULES = \ httpc_cookie_SUITE \ httpc_proxy_SUITE \ httpd_SUITE \ + old_httpd_SUITE \ httpd_basic_SUITE \ httpd_mod \ httpd_block \ httpd_load \ httpd_time_test \ httpd_1_1 \ + httpd_1_0 \ httpd_test_lib \ inets_sup_SUITE \ inets_SUITE \ @@ -201,7 +203,7 @@ INETS_FILES = inets.config $(INETS_SPECS) # inets_tftp_suite INETS_DATADIRS = inets_SUITE_data inets_sup_SUITE_data -HTTPD_DATADIRS = httpd_test_data httpd_SUITE_data httpd_basic_SUITE_data +HTTPD_DATADIRS = httpd_test_data httpd_SUITE_data httpd_basic_SUITE_data old_httpd_SUITE_data HTTPC_DATADIRS = httpc_SUITE_data httpc_proxy_SUITE_data FTP_DATADIRS = ftp_SUITE_data |