From eda7759eb3eb28e9bfc22ed26fae4e015791abb5 Mon Sep 17 00:00:00 2001
From: Lukasz Jobczyk <lukasz.jobczyk@intel.com>
Date: Tue, 17 Mar 2020 12:29:37 +0100
Subject: [PATCH] Revert page fault unit tests target

Change-Id: I3effe56c21e02f980bb18be6c5a38abca7533ae9
Signed-off-by: Lukasz Jobczyk <lukasz.jobczyk@intel.com>
---
 .../unit_test/memory_manager/CMakeLists.txt   | 13 +++++
 .../page_fault_manager_tests/CMakeLists.txt   | 58 -------------------
 2 files changed, 13 insertions(+), 58 deletions(-)
 delete mode 100644 opencl/test/unit_test/page_fault_manager_tests/CMakeLists.txt

diff --git a/opencl/test/unit_test/memory_manager/CMakeLists.txt b/opencl/test/unit_test/memory_manager/CMakeLists.txt
index 443615ad8c..1afd3c26ee 100644
--- a/opencl/test/unit_test/memory_manager/CMakeLists.txt
+++ b/opencl/test/unit_test/memory_manager/CMakeLists.txt
@@ -33,5 +33,18 @@ set(IGDRCL_SRCS_tests_memory_manager
 get_property(NEO_CORE_UNIFIED_MEMORY_TESTS GLOBAL PROPERTY NEO_CORE_UNIFIED_MEMORY_TESTS)
 list(APPEND IGDRCL_SRCS_tests_memory_manager ${NEO_CORE_UNIFIED_MEMORY_TESTS})
 
+get_property(NEO_CORE_CPU_PAGE_FAULT_MANAGER_TESTS GLOBAL PROPERTY NEO_CORE_CPU_PAGE_FAULT_MANAGER_TESTS)
+list(APPEND IGDRCL_SRCS_tests_memory_manager ${NEO_CORE_CPU_PAGE_FAULT_MANAGER_TESTS})
+
+if(WIN32)
+  get_property(NEO_CORE_PAGE_FAULT_MANAGER_WINDOWS_TESTS GLOBAL PROPERTY NEO_CORE_PAGE_FAULT_MANAGER_WINDOWS_TESTS)
+  list(APPEND IGDRCL_SRCS_tests_memory_manager ${NEO_CORE_PAGE_FAULT_MANAGER_WINDOWS_TESTS})
+endif()
+
+if(UNIX)
+  get_property(NEO_CORE_PAGE_FAULT_MANAGER_LINUX_TESTS GLOBAL PROPERTY NEO_CORE_PAGE_FAULT_MANAGER_LINUX_TESTS)
+  list(APPEND IGDRCL_SRCS_tests_memory_manager ${NEO_CORE_PAGE_FAULT_MANAGER_LINUX_TESTS})
+endif()
+
 target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_memory_manager})
 add_subdirectories()
diff --git a/opencl/test/unit_test/page_fault_manager_tests/CMakeLists.txt b/opencl/test/unit_test/page_fault_manager_tests/CMakeLists.txt
deleted file mode 100644
index ba3855e60e..0000000000
--- a/opencl/test/unit_test/page_fault_manager_tests/CMakeLists.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2020 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-#
-
-project(neo_page_fault_manager_tests)
-
-add_executable(neo_page_fault_manager_tests
-  $<TARGET_OBJECTS:igdrcl_libult>
-  $<TARGET_OBJECTS:igdrcl_libult_cs>
-  $<TARGET_OBJECTS:igdrcl_libult_env>
-  $<TARGET_OBJECTS:mock_gmm>
-  ${NEO_SOURCE_DIR}/opencl/source/aub/aub_stream_interface.cpp
-  ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/os_interface.cpp
-  ${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_configuration.cpp
-)
-
-append_sources_from_properties(CPU_PAGE_FAULT_MANAGER_TESTS  NEO_CORE_CPU_PAGE_FAULT_MANAGER_TESTS)
-append_sources_from_properties(CPU_PAGE_FAULT_MANAGER_WINDOWS_TESTS  NEO_CORE_PAGE_FAULT_MANAGER_WINDOWS_TESTS)
-append_sources_from_properties(CPU_PAGE_FAULT_MANAGER_LINUX_TESTS  NEO_CORE_PAGE_FAULT_MANAGER_LINUX_TESTS)
-
-target_sources(neo_page_fault_manager_tests PRIVATE ${CPU_PAGE_FAULT_MANAGER_TESTS})
-
-if(WIN32)
-  target_sources(neo_page_fault_manager_tests PRIVATE
-  ${CPU_PAGE_FAULT_MANAGER_WINDOWS_TESTS}
-  ${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
-)
-else()
-  target_sources(neo_page_fault_manager_tests PRIVATE
-  ${CPU_PAGE_FAULT_MANAGER_LINUX_TESTS}
-  ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp
-  )
-endif()
-
-target_link_libraries(neo_page_fault_manager_tests ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS})
-
-target_include_directories(neo_page_fault_manager_tests PRIVATE
-  ${NEO_SHARED_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX}
-  ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen_common${BRANCH_DIR_SUFFIX}
-)
-
-create_project_source_tree(neo_page_fault_manager_tests)
-
-add_custom_target(run_page_fault_manager_tests ALL DEPENDS unit_tests neo_page_fault_manager_tests)
-add_custom_command(
-  TARGET run_page_fault_manager_tests
-  POST_BUILD
-  COMMAND WORKING_DIRECTORY ${TargetDir}
-  COMMAND echo Target Directory is: ${TargetDir}
-  COMMAND echo Running page fault manager tests
-  COMMAND neo_page_fault_manager_tests
-)
-add_dependencies(run_unit_tests run_page_fault_manager_tests)
-
-set_target_properties(neo_page_fault_manager_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
-set_target_properties(run_page_fault_manager_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})