Refs #21244: Correct xfail lists

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
eProsima · Jul 3, 2024 · be0425d · be0425d
1 parent d2898b7
commit be0425d
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 13 deletions.
diff --git a/test/blackbox/XFAIL_DDS_PIM_SECURITY.list b/test/blackbox/XFAIL_DDS_PIM_SECURITY.list
@@ -1,4 +1,4 @@
 BlackboxTests_DDS_PIM.Security.BuiltinAuthenticationAndCryptoPlugin_reliable_rtps_large_string.Datasharing
 BlackboxTests_DDS_PIM.Security.BuiltinAuthenticationAndAccessAndCryptoPlugin_PermissionsDisableDiscoveryDisableAccessEncrypt_validation_ok_disable_discovery_enable_access_none.Transport
 BlackboxTests_DDS_PIM.Security.BuiltinAuthenticationAndAccessAndCryptoPlugin_PermissionsDisableDiscoveryEnableAccessNone_validation_ok_enable_discovery_enable_access_none.Datasharing
-BlackboxTests_DDS_PIM.Security.BuiltinAuthenticationAndAccessAndCryptoPlugin_PermissionsEnableDiscoveryDisableAccessNone_validation_ok_disable_discovery_enable_access_none.Transport
+BlackboxTests_DDS_PIM.Security.BuiltinAuthenticationAndAccessAndCryptoPlugin_PermissionsEnableDiscoveryDisableAccessNone_validation_ok_disable_discovery_enable_access_none.Transport
diff --git a/test/communication/CMakeLists.txt b/test/communication/CMakeLists.txt
@@ -645,3 +645,10 @@ if(Python3_Interpreter_FOUND)
     endif()
 
 endif()
+
+# Add 'xfail' label to flaky tests
+set(COMMUNICATION_XFAIL_LIST XFAIL_COMMUNICATION)
+
+foreach(COMMUNICATION_XFAIL_TEST ${COMMUNICATION_XFAIL_LIST})
+    add_xfail_label(${CMAKE_CURRENT_SOURCE_DIR}/${COMMUNICATION_XFAIL_TEST}.list)
+endforeach()
diff --git a/test/communication/XFAIL_COMMUNICATION.list b/test/communication/XFAIL_COMMUNICATION.list
@@ -0,0 +1,4 @@
+TwoPublishersCommunicationBestEffort
+SimpleCommunicationReliable
+SHMCommunicationSubscriberDiesWhileProcessingMessage
+
diff --git a/test/dds/communication/XFAIL_DDS_COMMUNICATION.list b/test/dds/communication/XFAIL_DDS_COMMUNICATION.list
@@ -1,6 +1,4 @@
 DDSCommunication_zero_copy_pub_communication
-TwoPublishersCommunicationBestEffort
 DDSCommunication_zero_copy_communication
-SimpleCommunicationReliable
-SHMCommunicationSubscriberDiesWhileProcessingMessage
-DDSCommunication_mix_zero_copy_communication
+DDSCommunication_mix_zero_copy_communication
+
diff --git a/test/performance/CMakeLists.txt b/test/performance/CMakeLists.txt
@@ -29,9 +29,3 @@ if(VIDEO_TESTS)
     add_subdirectory(video)
 endif()
 
-# Add 'xfail' label to flaky tests
-set(PERFORMANCE_XFAIL_LIST XFAIL_PERFORMANCE)
-
-foreach(PERFORMANCE_XFAIL_TEST ${PERFORMANCE_XFAIL_LIST})
-    add_xfail_label(${CMAKE_CURRENT_SOURCE_DIR}/${PERFORMANCE_XFAIL_TEST}.list)
-endforeach()
diff --git a/test/performance/latency/CMakeLists.txt b/test/performance/latency/CMakeLists.txt
@@ -302,3 +302,10 @@ if(Python3_Interpreter_FOUND)
 
     endforeach(latency_test_name)
 endif()
+
+# Add 'xfail' label to flaky tests
+set(LATENCY_XFAIL_LIST XFAIL_LATENCY)
+
+foreach(LATENCY_XFAIL_TEST ${LATENCY_XFAIL_LIST})
+    add_xfail_label(${CMAKE_CURRENT_SOURCE_DIR}/${LATENCY_XFAIL_TEST}.list)
+endforeach()
diff --git a/test/performance/XFAIL_PERFORMANCE.list → test/performance/latency/XFAIL_LATENCY.list b/test/performance/XFAIL_PERFORMANCE.list → test/performance/latency/XFAIL_LATENCY.list
@@ -1,5 +1,3 @@
-performance.throughput.interprocess_best_effort_shm.data_loans_and_sharing
 performance.latency.interprocess_best_effort_shm.security
-performance.throughput.interprocess_best_effort_udp
 performance.latency.interprocess_reliable_shm
 performance.latency.interprocess_best_effort_shm.data_loans_and_sharing
diff --git a/test/performance/throughput/CMakeLists.txt b/test/performance/throughput/CMakeLists.txt
@@ -303,3 +303,10 @@ if(Python3_Interpreter_FOUND)
 
     endforeach(throughput_test_name)
 endif()
+
+# Add 'xfail' label to flaky tests
+set(THROUGHPUT_XFAIL_LIST XFAIL_THROUGHPUT)
+
+foreach(THROUGHPUT_XFAIL_TEST ${THROUGHPUT_XFAIL_LIST})
+    add_xfail_label(${CMAKE_CURRENT_SOURCE_DIR}/${THROUGHPUT_XFAIL_TEST}.list)
+endforeach()
diff --git a/test/performance/throughput/XFAIL_THROUGHPUT.list b/test/performance/throughput/XFAIL_THROUGHPUT.list
@@ -0,0 +1,2 @@
+performance.throughput.interprocess_best_effort_shm.data_loans_and_sharing
+performance.throughput.interprocess_best_effort_udp