Debian Codegraph @

debian/patches/0001-Integrate-unit-tests-in-cmake-s-test-framework.patch

raw
1 From: Sebastian Ramacher <[email protected]>
2 Date: Mon, 19 Nov 2018 22:35:07 +0100
3 Subject: Integrate unit tests in cmake's test framework
4
5 ---
6 CMakeLists.txt | 1 +
7 media_driver/linux/ult/CMakeLists.txt | 7 -------
8 media_driver/linux/ult/ult_app/CMakeLists.txt | 12 ++++--------
9 3 files changed, 5 insertions(+), 15 deletions(-)
10
11 diff --git a/CMakeLists.txt b/CMakeLists.txt
12 index ac55177..781d2b9 100755
13 --- a/CMakeLists.txt
14 +++ b/CMakeLists.txt
15 @@ -82,6 +82,7 @@ if (BUILD_KERNELS)
16 add_subdirectory(Tools/MediaDriverTools)
17 endif()
18
19 +enable_testing()
20 add_subdirectory(media_driver)
21
22 if("${LIBVA_DRIVERS_PATH}" STREQUAL "")
23 diff --git a/media_driver/linux/ult/CMakeLists.txt b/media_driver/linux/ult/CMakeLists.txt
24 index 9fb5b39..4f54575 100644
25 --- a/media_driver/linux/ult/CMakeLists.txt
26 +++ b/media_driver/linux/ult/CMakeLists.txt
27 @@ -51,10 +51,3 @@ endif ()
28
29 add_subdirectory(libdrm_mock)
30 add_subdirectory(ult_app)
31 -
32 -enable_testing()
33 -add_test(NAME test_devult COMMAND devult ${UMD_PATH})
34 -set_tests_properties(test_devult
35 - PROPERTIES PASS_REGULAR_EXPRESSION "PASS")
36 -set_tests_properties(test_devult
37 - PROPERTIES FAIL_REGULAR_EXPRESSION "FAIL")
38 diff --git a/media_driver/linux/ult/ult_app/CMakeLists.txt b/media_driver/linux/ult/ult_app/CMakeLists.txt
39 index 1b24fed..c170a7f 100644
40 --- a/media_driver/linux/ult/ult_app/CMakeLists.txt
41 +++ b/media_driver/linux/ult/ult_app/CMakeLists.txt
42 @@ -73,13 +73,9 @@ if (DEFINED BYPASS_MEDIA_ULT AND "${BYPASS_MEDIA_ULT}" STREQUAL "yes")
43 message("-- media -- BYPASS_MEDIA_ULT = ${BYPASS_MEDIA_ULT}")
44 else ()
45 if (ENABLE_NONFREE_KERNELS)
46 - add_custom_target(RunULT ALL DEPENDS ${LIB_NAME} devult)
47 -
48 - add_custom_command(
49 - TARGET RunULT
50 - POST_BUILD
51 - COMMAND LD_PRELOAD=${MEDIA_MISC_LIB}:../libdrm_mock/libdrm_mock.so ./devult ../../../${LIB_NAME}.so
52 - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
53 - COMMENT "Running devult...")
54 + add_test(
55 + NAME ULT
56 + COMMAND env LD_PRELOAD=$<TARGET_FILE:drm_mock> $<TARGET_FILE:devult> ../../../${LIB_NAME}.so
57 + )
58 endif ()
59 endif ()