diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-09-10 09:13:50 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-09-10 09:13:50 +0200 |
| commit | 45f29845fea2fa036e03f0faf451ca98813b3112 (patch) | |
| tree | 4e3c55305a35454ad20e87783fe7838c5c184389 /lib/inets/test/Makefile | |
| parent | 79da6e851e98729d103979ba466d47f4fa4421b2 (diff) | |
| parent | 628553c2946649ef1715feacc05e8f75d38ef2e3 (diff) | |
| download | otp-45f29845fea2fa036e03f0faf451ca98813b3112.tar.gz otp-45f29845fea2fa036e03f0faf451ca98813b3112.tar.bz2 otp-45f29845fea2fa036e03f0faf451ca98813b3112.zip | |
Merge branch 'ia/inets/httpd/tftpd/fd/OTP-12875/OTP-12898' into maint
* ia/inets/httpd/tftpd/fd/OTP-12875/OTP-12898:
inets: Add test suite for socket_wrap feature
inets: Ctify inets_SUITE
inets: tftpd - Mend broken fd option
inets: httpd - Mend broken fd option
Diffstat (limited to 'lib/inets/test/Makefile')
| -rw-r--r-- | lib/inets/test/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/inets/test/Makefile b/lib/inets/test/Makefile index cae77a05f3..607ec7c182 100644 --- a/lib/inets/test/Makefile +++ b/lib/inets/test/Makefile @@ -174,7 +174,8 @@ MODULES = \ inets_appup_test \ tftp_test_lib \ tftp_SUITE \ - uri_SUITE + uri_SUITE \ + inets_socketwrap_SUITE EBIN = . @@ -203,7 +204,7 @@ INETS_FILES = inets.config $(INETS_SPECS) # inets_ftp_suite \ # inets_tftp_suite -INETS_DATADIRS = inets_SUITE_data inets_sup_SUITE_data +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 HTTPC_DATADIRS = httpc_SUITE_data httpc_proxy_SUITE_data FTP_DATADIRS = ftp_SUITE_data @@ -250,7 +251,7 @@ ERL_COMPILE_FLAGS += \ # 1) INETS_PRIV_DIR must be created # ---------------------------------------------------- -tests debug opt: $(BUILDTARGET) +tests debug opt: $(BUILDTARGET) targets: $(TARGET_FILES) |