From c5e8a20462f8c5fbb465c029cad05bc124a17510 Mon Sep 17 00:00:00 2001 From: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Date: Mon, 17 May 2021 13:02:28 -0700 Subject: [PATCH] Re-enable and fix failing AZ_NETWORKING_TESTS on Linux - Enable the previously failing network unit tests for TcpTransportTests for Linux: TestSingleClient and TestMultipleClients - Switch Linux to use SELECT implementation of the TCP Socket Manager instead of the EPOLL version (root cause of the failure) --- .../Linux/AzNetworking/AzNetworking_Traits_Platform.h | 4 ++-- .../AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Code/Framework/AzNetworking/Platform/Linux/AzNetworking/AzNetworking_Traits_Platform.h b/Code/Framework/AzNetworking/Platform/Linux/AzNetworking/AzNetworking_Traits_Platform.h index 678623ad96..51fe778d9a 100644 --- a/Code/Framework/AzNetworking/Platform/Linux/AzNetworking/AzNetworking_Traits_Platform.h +++ b/Code/Framework/AzNetworking/Platform/Linux/AzNetworking/AzNetworking_Traits_Platform.h @@ -14,8 +14,8 @@ #define AZ_TRAIT_OS_USE_WINSOCK 0 #define AZ_TRAIT_OS_USE_MACH 0 -#define AZ_TRAIT_USE_SOCKET_SERVER_EPOLL 1 -#define AZ_TRAIT_USE_SOCKET_SERVER_SELECT 0 +#define AZ_TRAIT_USE_SOCKET_SERVER_EPOLL 0 +#define AZ_TRAIT_USE_SOCKET_SERVER_SELECT 1 #define AZ_TRAIT_USE_OPENSSL 1 #define AZ_TRAIT_NEEDS_HTONLL 1 diff --git a/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h b/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h index f283a6b6aa..0090ce066b 100644 --- a/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h +++ b/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h @@ -28,7 +28,6 @@ #define AZ_TRAIT_DISABLE_FAILED_ZERO_COLOR_CONVERSION_TEST true #define AZ_TRAIT_DISABLE_FAILED_FRAMEPROFILER_TEST true #define AZ_TRAIT_DISABLE_FAILED_FRAMEWORK_TESTS true -#define AZ_TRAIT_DISABLE_FAILED_NETWORKING_TESTS true #define AZ_TRAIT_DISABLE_FAILED_GRADIENT_SIGNAL_TESTS true #define AZ_TRAIT_DISABLE_FAILED_MULTIPLAYER_GRIDMATE_TESTS true #define AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS true