diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-12-15 11:02:17 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-12-15 11:02:17 +0100 |
| commit | 9b61f4f4b26a77ca08b2a4a4f7776aac58bdff53 (patch) | |
| tree | c9964a41960d97eeeaaf3373545509264fb94ae0 /lib/inets/test/Makefile | |
| parent | ca00af6271665772c97bb2e146b0f5cbb760a97c (diff) | |
| parent | 5ca4a8eb3e3e744a5324f5e52d5b9d561a4dbf92 (diff) | |
| download | otp-9b61f4f4b26a77ca08b2a4a4f7776aac58bdff53.tar.gz otp-9b61f4f4b26a77ca08b2a4a4f7776aac58bdff53.tar.bz2 otp-9b61f4f4b26a77ca08b2a4a4f7776aac58bdff53.zip | |
Merge branch 'ingela/inets/http-benchmarks' into maint
* ingela/inets/http-benchmarks:
inets: Add comparable benchmark tests
inets: Create httpd benchmark framwork
Diffstat (limited to 'lib/inets/test/Makefile')
| -rw-r--r-- | lib/inets/test/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/inets/test/Makefile b/lib/inets/test/Makefile index ffc512050a..95e0559470 100644 --- a/lib/inets/test/Makefile +++ b/lib/inets/test/Makefile @@ -150,6 +150,7 @@ INETS_ROOT = ../../inets MODULES = \ inets_test_lib \ erl_make_certs \ + make_certs \ ftp_SUITE \ ftp_format_SUITE \ http_format_SUITE \ @@ -157,6 +158,8 @@ MODULES = \ httpc_cookie_SUITE \ httpc_proxy_SUITE \ httpd_SUITE \ + httpd_bench_SUITE \ + http_test_lib \ old_httpd_SUITE \ httpd_basic_SUITE \ httpd_mod \ @@ -189,7 +192,7 @@ SOURCE = $(ERL_FILES) $(HRL_FILES) TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) -INETS_SPECS = inets.spec +INETS_SPECS = inets.spec inets_bench.spec COVER_FILE = inets.cover INETS_FILES = inets.config $(INETS_SPECS) @@ -200,8 +203,10 @@ INETS_FILES = inets.config $(INETS_SPECS) # inets_ftp_suite \ # inets_tftp_suite + INETS_DATADIRS = inets_SUITE_data inets_socketwrap_SUITE_data -HTTPD_DATADIRS = httpd_test_data httpd_SUITE_data httpd_basic_SUITE_data old_httpd_SUITE_data +HTTPD_DATADIRS = httpd_test_data httpd_SUITE_data httpd_basic_SUITE_data old_httpd_SUITE_data httpd_bench_SUITE_data + HTTPC_DATADIRS = httpc_SUITE_data httpc_proxy_SUITE_data FTP_DATADIRS = ftp_SUITE_data |