diff options
| author | Micael Karlberg <[email protected]> | 2018-10-19 12:13:26 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2018-10-19 12:13:26 +0200 |
| commit | b4d61414565e6c6aa34249bf5d6eb3d5e5952b76 (patch) | |
| tree | 4d9f86f9282b465a1a693cf9afbdb4ec5fd167e7 | |
| parent | 890b7523ad3119415fecc6fbaaa5b07b9c973b35 (diff) | |
| download | otp-b4d61414565e6c6aa34249bf5d6eb3d5e5952b76.tar.gz otp-b4d61414565e6c6aa34249bf5d6eb3d5e5952b76.tar.bz2 otp-b4d61414565e6c6aa34249bf5d6eb3d5e5952b76.zip | |
[socket-nif|test] Moved socket tests from kernel to erts/emulator
OTP-14831
| -rw-r--r-- | erts/emulator/test/Makefile | 11 | ||||
| -rw-r--r-- | erts/emulator/test/socket_SUITE.erl (renamed from lib/kernel/test/socket_SUITE.erl) | 0 | ||||
| -rw-r--r-- | erts/emulator/test/socket_client.erl (renamed from lib/kernel/test/socket_client.erl) | 0 | ||||
| -rw-r--r-- | erts/emulator/test/socket_lib.erl (renamed from lib/kernel/test/socket_lib.erl) | 0 | ||||
| -rw-r--r-- | erts/emulator/test/socket_server.erl (renamed from lib/kernel/test/socket_server.erl) | 0 | ||||
| -rw-r--r-- | lib/kernel/test/Makefile | 12 |
6 files changed, 12 insertions, 11 deletions
diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile index bf00de2204..4f47ec47ef 100644 --- a/erts/emulator/test/Makefile +++ b/erts/emulator/test/Makefile @@ -28,6 +28,12 @@ EBIN = . # Target Specs # ---------------------------------------------------- +SOCKET_MODULES = \ + socket_lib \ + socket_server \ + socket_client \ + socket_SUITE + MODULES= \ a_SUITE \ after_SUITE \ @@ -103,6 +109,7 @@ MODULES= \ sensitive_SUITE \ signal_SUITE \ smoke_test_SUITE \ + $(SOCKET_MODULES) \ statistics_SUITE \ system_info_SUITE \ system_profile_SUITE \ @@ -151,6 +158,7 @@ NATIVE_ERL_FILES= $(NATIVE_MODULES:%=%.erl) ERL_FILES= $(MODULES:%=%.erl) TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) +SOCKET_TARGET = $(SOCKET_MODULES:%=$(EBIN)/%.$(EMULATOR)) EMAKEFILE=Emakefile @@ -197,6 +205,9 @@ clean: docs: +targets: $(TARGET_FILES) +socket_targets: $(SOCKET_TARGETS) + # ---------------------------------------------------- # Special targets # ---------------------------------------------------- diff --git a/lib/kernel/test/socket_SUITE.erl b/erts/emulator/test/socket_SUITE.erl index 022e83a944..022e83a944 100644 --- a/lib/kernel/test/socket_SUITE.erl +++ b/erts/emulator/test/socket_SUITE.erl diff --git a/lib/kernel/test/socket_client.erl b/erts/emulator/test/socket_client.erl index 1c07e799b8..1c07e799b8 100644 --- a/lib/kernel/test/socket_client.erl +++ b/erts/emulator/test/socket_client.erl diff --git a/lib/kernel/test/socket_lib.erl b/erts/emulator/test/socket_lib.erl index 9d6524d467..9d6524d467 100644 --- a/lib/kernel/test/socket_lib.erl +++ b/erts/emulator/test/socket_lib.erl diff --git a/lib/kernel/test/socket_server.erl b/erts/emulator/test/socket_server.erl index 45adffc5e6..45adffc5e6 100644 --- a/lib/kernel/test/socket_server.erl +++ b/erts/emulator/test/socket_server.erl diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile index 28edf4889b..8b16e83707 100644 --- a/lib/kernel/test/Makefile +++ b/lib/kernel/test/Makefile @@ -24,11 +24,6 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk # Target Specs # ---------------------------------------------------- -SOCKET_MODULES = \ - socket_lib \ - socket_server \ - socket_client - MODULES= \ rpc_SUITE \ pdict_SUITE \ @@ -95,9 +90,7 @@ MODULES= \ sendfile_SUITE \ standard_error_SUITE \ multi_load_SUITE \ - zzz_SUITE \ - socket_SUITE \ - $(SOCKET_MODULES) + zzz_SUITE APP_FILES = \ appinc.app \ @@ -134,7 +127,6 @@ ERL_COMPILE_FLAGS += EBIN = . -SOCKET_TARGETS = $(SOCKET_MODULES:%=$(EBIN)/%.$(EMULATOR)) TARGETS = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) @@ -160,8 +152,6 @@ docs: targets: $(TARGETS) -socket: $(SOCKET_TARGETS) - # ---------------------------------------------------- # Release Target |