diff options
| author | Micael Karlberg <bmk@erlang.org> | 2019-11-25 18:50:27 +0100 |
|---|---|---|
| committer | Micael Karlberg <bmk@erlang.org> | 2019-11-25 18:50:27 +0100 |
| commit | fad332748b4a731fe336b51335e9d10a35e5c738 (patch) | |
| tree | e404cc2269776bf9cdfd5d459ab3731a3ec2f202 | |
| parent | 2fac8c62f5c7a360d33791c5b37e629b567e653a (diff) | |
| download | erlang-fad332748b4a731fe336b51335e9d10a35e5c738.tar.gz | |
[enet] Moved net test suite into its proper place
Moved the net test suite into the kernel app,
where it belongs (since thats where the net
module exist).
OTP-16212
| -rw-r--r-- | erts/emulator/test/Makefile | 6 | ||||
| -rw-r--r-- | lib/kernel/test/Makefile | 1 | ||||
| -rw-r--r-- | lib/kernel/test/net_SUITE.erl (renamed from erts/emulator/test/net_SUITE.erl) | 0 |
3 files changed, 1 insertions, 6 deletions
diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile index 9fdb4003db..478555a902 100644 --- a/erts/emulator/test/Makefile +++ b/erts/emulator/test/Makefile @@ -43,9 +43,6 @@ SOCKET_MODULES = \ socket_test_ttest_tcp_server_socket \ socket_SUITE -NET_MODULES = \ - net_SUITE - MODULES= \ a_SUITE \ after_SUITE \ @@ -102,7 +99,6 @@ MODULES= \ monitor_SUITE \ multi_load_SUITE \ nested_SUITE \ - $(NET_MODULES) \ nif_SUITE \ node_container_SUITE \ nofrag_SUITE \ @@ -181,7 +177,6 @@ HRL_FILES= \ socket_test_ttest_client.hrl TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) -NET_TARGETS = $(NET_MODULES:%=$(EBIN)/%.$(EMULATOR)) SOCKET_TARGETS = $(SOCKET_MODULES:%=$(EBIN)/%.$(EMULATOR)) EMAKEFILE=Emakefile @@ -227,7 +222,6 @@ docs: targets: $(TARGET_FILES) socket_targets: $(SOCKET_TARGETS) -net_targets: $(NET_TARGETS) # ---------------------------------------------------- # Special targets diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile index 6763a04d9f..bd1590ee8f 100644 --- a/lib/kernel/test/Makefile +++ b/lib/kernel/test/Makefile @@ -83,6 +83,7 @@ MODULES= \ logger_std_h_SUITE \ logger_stress_SUITE \ logger_test_lib \ + net_SUITE \ os_SUITE \ pg2_SUITE \ seq_trace_SUITE \ diff --git a/erts/emulator/test/net_SUITE.erl b/lib/kernel/test/net_SUITE.erl index c6e77a5373..c6e77a5373 100644 --- a/erts/emulator/test/net_SUITE.erl +++ b/lib/kernel/test/net_SUITE.erl |