diff options
| author | Manuel Bentele | 2020-10-13 16:19:21 +0200 |
|---|---|---|
| committer | Manuel Bentele | 2020-10-13 16:19:21 +0200 |
| commit | 111a2350ac1967b62ffa3024371819c812c46844 (patch) | |
| tree | e31808a39291fe3bfa53e921a51dc74be36468ae /kernel/tests | |
| parent | Added separate Linux kernel install directory and added version to kernel mod... (diff) | |
| download | xloop-111a2350ac1967b62ffa3024371819c812c46844.tar.gz xloop-111a2350ac1967b62ffa3024371819c812c46844.tar.xz xloop-111a2350ac1967b62ffa3024371819c812c46844.zip | |
Added support to keep track of kernel file changes in CMake
With this patch, CMake keeps track of changes to original xloop Linux
kernel source files. CMake will copy each file if a change is detected
without rebuiling the CMake build and cache files.
Futhrmore, changed default paths of udev rules and xloop kernel modules
to be installed.
Diffstat (limited to 'kernel/tests')
| -rw-r--r-- | kernel/tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kernel/tests/include/lapi/xloop.h | 2 | ||||
| -rw-r--r-- | kernel/tests/lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | kernel/tests/lib/tst_device.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/kernel/tests/CMakeLists.txt b/kernel/tests/CMakeLists.txt index f086864..e93ff9d 100644 --- a/kernel/tests/CMakeLists.txt +++ b/kernel/tests/CMakeLists.txt @@ -4,7 +4,7 @@ project(xloop-kernel-test) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/old) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../uapi) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) # configure configuration config.h and add it to the include directories configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) diff --git a/kernel/tests/include/lapi/xloop.h b/kernel/tests/include/lapi/xloop.h index 8e57b31..769d1f0 100644 --- a/kernel/tests/include/lapi/xloop.h +++ b/kernel/tests/include/lapi/xloop.h @@ -8,7 +8,7 @@ #include "config.h" #include <linux/types.h> -#include <linux/xloop.h> +#include <uapi_xloop.h> #ifndef LO_FLAGS_PARTSCAN # define LO_FLAGS_PARTSCAN 8 diff --git a/kernel/tests/lib/CMakeLists.txt b/kernel/tests/lib/CMakeLists.txt index 9cea565..0ce8982 100644 --- a/kernel/tests/lib/CMakeLists.txt +++ b/kernel/tests/lib/CMakeLists.txt @@ -67,3 +67,4 @@ add_library(libltp STATIC ${CMAKE_CURRENT_SOURCE_DIR}/cloner.c ${CMAKE_CURRENT_SOURCE_DIR}/tst_virt.c ${CMAKE_CURRENT_SOURCE_DIR}/tst_wallclock.c) target_include_directories(libltp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +target_compile_options(libltp PUBLIC "-Wno-deprecated-declarations") diff --git a/kernel/tests/lib/tst_device.c b/kernel/tests/lib/tst_device.c index 24f34a3..0df8efe 100644 --- a/kernel/tests/lib/tst_device.c +++ b/kernel/tests/lib/tst_device.c @@ -28,7 +28,7 @@ #include <errno.h> #include <unistd.h> #include <stdlib.h> -#include <linux/xloop.h> +#include <uapi_xloop.h> #include <stdint.h> #include <inttypes.h> #include <sys/sysmacros.h> |