feature: events deadlock detection in validation layer

Related-To: NEO-12810 Signed-off-by: Chandio, Bibrak Qamar <[email protected]>
oneapi-src · Nov 14, 2024 · 9dd299e · 9dd299e
1 parent 6a81f8c
commit 9dd299e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -50,8 +50,4 @@ if(NOT MSVC)
     set_property(TEST tests_event_deadlock_reset PROPERTY ENVIRONMENT "ZE_ENABLE_NULL_DRIVER=1;ZE_ENABLE_VALIDATION_LAYER=1;ZEL_ENABLE_EVENTS_CHECKER=1")
     add_test(NAME tests_event_reset_reuse COMMAND tests --gtest_filter=*GivenLevelZeroLoaderPresentWhenCallingzeEventHostResetWithAlreadySignaledEventThenUsingEventAgainThenValidationLayerDoesNotPrintsWarningOfIllegalUsage*)
     set_property(TEST tests_event_reset_reuse PROPERTY ENVIRONMENT "ZE_ENABLE_NULL_DRIVER=1;ZE_ENABLE_VALIDATION_LAYER=1;ZEL_ENABLE_EVENTS_CHECKER=1")
-<<<<<<< HEAD
 endif()
-=======
-endif()
->>>>>>> 9ed07c2 (feature: events deadlock detection in validation layer)