diff options
| -rw-r--r-- | src/kernel/tests/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/kernel/tests/include/config.h (renamed from src/kernel/tests/include/config.h.in) | 8 | ||||
| -rw-r--r-- | src/kernel/tests/lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/kernel/tests/testcases/kernel/syscalls/ioctl/CMakeLists.txt | 14 |
4 files changed, 15 insertions, 14 deletions
diff --git a/src/kernel/tests/CMakeLists.txt b/src/kernel/tests/CMakeLists.txt index e93ff9d..201abcb 100644 --- a/src/kernel/tests/CMakeLists.txt +++ b/src/kernel/tests/CMakeLists.txt @@ -4,11 +4,9 @@ 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}/..) -# 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) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +# include parent directory for the xloop's uapi +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) add_subdirectory(lib) add_subdirectory(testcases/kernel/syscalls/ioctl) diff --git a/src/kernel/tests/include/config.h.in b/src/kernel/tests/include/config.h index 2d59b1c..3839234 100644 --- a/src/kernel/tests/include/config.h.in +++ b/src/kernel/tests/include/config.h @@ -1,6 +1,8 @@ /* include/config.h. Generated from config.h.in by configure. */ /* include/config.h.in. Generated from configure.ac by autoheader. */ +#include <xloop/version.h> + /* Define to 1 if clone() supports 7 arguments. */ #define CLONE_SUPPORTS_7_ARGS 1 @@ -566,7 +568,7 @@ #define PACKAGE_NAME "ltp" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ltp @VERSION@" +#define PACKAGE_STRING ("ltp " XLOOP_VERSION) /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ltp" @@ -575,7 +577,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "@VERSION@" +#define PACKAGE_VERSION XLOOP_VERSION /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -584,7 +586,7 @@ /* #undef UCLINUX */ /* Version number of package */ -#define VERSION "@VERSION@" +#define VERSION XLOOP_VERSION /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ diff --git a/src/kernel/tests/lib/CMakeLists.txt b/src/kernel/tests/lib/CMakeLists.txt index 0ce8982..5b3f421 100644 --- a/src/kernel/tests/lib/CMakeLists.txt +++ b/src/kernel/tests/lib/CMakeLists.txt @@ -68,3 +68,4 @@ add_library(libltp STATIC ${CMAKE_CURRENT_SOURCE_DIR}/cloner.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") +target_link_libraries(libltp LINK_PUBLIC xloop-version) diff --git a/src/kernel/tests/testcases/kernel/syscalls/ioctl/CMakeLists.txt b/src/kernel/tests/testcases/kernel/syscalls/ioctl/CMakeLists.txt index 6f7c5bb..f503838 100644 --- a/src/kernel/tests/testcases/kernel/syscalls/ioctl/CMakeLists.txt +++ b/src/kernel/tests/testcases/kernel/syscalls/ioctl/CMakeLists.txt @@ -4,42 +4,42 @@ project(xloop-kernel-test-ioctl_xloop) # test ioctl_xloop01 add_executable(ioctl_xloop01 ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_xloop01.c) -target_link_libraries(ioctl_xloop01 LINK_PUBLIC libltp) +target_link_libraries(ioctl_xloop01 libltp) install(TARGETS ioctl_xloop01 DESTINATION bin COMPONENT test) # test ioctl_xloop02 add_executable(ioctl_xloop02 ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_xloop02.c) -target_link_libraries(ioctl_xloop02 LINK_PUBLIC libltp) +target_link_libraries(ioctl_xloop02 libltp) install(TARGETS ioctl_xloop02 DESTINATION bin COMPONENT test) # test ioctl_xloop03 add_executable(ioctl_xloop03 ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_xloop03.c) -target_link_libraries(ioctl_xloop03 LINK_PUBLIC libltp) +target_link_libraries(ioctl_xloop03 libltp) install(TARGETS ioctl_xloop03 DESTINATION bin COMPONENT test) # test ioctl_xloop04 add_executable(ioctl_xloop04 ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_xloop04.c) -target_link_libraries(ioctl_xloop04 LINK_PUBLIC libltp) +target_link_libraries(ioctl_xloop04 libltp) install(TARGETS ioctl_xloop04 DESTINATION bin COMPONENT test) # test ioctl_xloop05 add_executable(ioctl_xloop05 ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_xloop05.c) -target_link_libraries(ioctl_xloop05 LINK_PUBLIC libltp) +target_link_libraries(ioctl_xloop05 libltp) install(TARGETS ioctl_xloop05 DESTINATION bin COMPONENT test) # test ioctl_xloop06 add_executable(ioctl_xloop06 ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_xloop06.c) -target_link_libraries(ioctl_xloop06 LINK_PUBLIC libltp) +target_link_libraries(ioctl_xloop06 libltp) install(TARGETS ioctl_xloop06 DESTINATION bin COMPONENT test) # test ioctl_xloop07 add_executable(ioctl_xloop07 ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_xloop07.c) -target_link_libraries(ioctl_xloop07 LINK_PUBLIC libltp) +target_link_libraries(ioctl_xloop07 libltp) install(TARGETS ioctl_xloop07 DESTINATION bin COMPONENT test) |