mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-06 03:28:11 +02:00
Cmake build system cleanup.
Converted tabs to spaces and removed trailing spaces in test dir.
This commit is contained in:
parent
0ed7d779b7
commit
4d8dcd5561
1 changed files with 57 additions and 57 deletions
|
|
@ -5,25 +5,25 @@ add_definitions(${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
|||
add_subdirectory( name-test )
|
||||
|
||||
set (test-service_SOURCES
|
||||
${CMAKE_SOURCE_DIR}/../test/test-service.c
|
||||
${CMAKE_SOURCE_DIR}/../test/test-utils.c
|
||||
${CMAKE_SOURCE_DIR}/../test/test-utils.h
|
||||
${CMAKE_SOURCE_DIR}/../test/test-service.c
|
||||
${CMAKE_SOURCE_DIR}/../test/test-utils.c
|
||||
${CMAKE_SOURCE_DIR}/../test/test-utils.h
|
||||
)
|
||||
|
||||
set (test-names_SOURCES
|
||||
${CMAKE_SOURCE_DIR}/../test/test-names.c
|
||||
${CMAKE_SOURCE_DIR}/../test/test-utils.c
|
||||
${CMAKE_SOURCE_DIR}/../test/test-utils.h
|
||||
${CMAKE_SOURCE_DIR}/../test/test-names.c
|
||||
${CMAKE_SOURCE_DIR}/../test/test-utils.c
|
||||
${CMAKE_SOURCE_DIR}/../test/test-utils.h
|
||||
)
|
||||
|
||||
set (break_loader_SOURCES
|
||||
${CMAKE_SOURCE_DIR}/../test/break-loader.c
|
||||
${CMAKE_SOURCE_DIR}/../test/break-loader.c
|
||||
)
|
||||
|
||||
set (test-shell-service_SOURCES
|
||||
${CMAKE_SOURCE_DIR}/../test/test-shell-service.c
|
||||
${CMAKE_SOURCE_DIR}/../test/test-utils.c
|
||||
${CMAKE_SOURCE_DIR}/../test/test-utils.h
|
||||
${CMAKE_SOURCE_DIR}/../test/test-shell-service.c
|
||||
${CMAKE_SOURCE_DIR}/../test/test-utils.c
|
||||
${CMAKE_SOURCE_DIR}/../test/test-utils.h
|
||||
)
|
||||
|
||||
set (shell-test_SOURCES
|
||||
|
|
@ -31,23 +31,23 @@ set (shell-test_SOURCES
|
|||
)
|
||||
|
||||
set (spawn-test_SOURCES
|
||||
${CMAKE_SOURCE_DIR}/../test/spawn-test.c
|
||||
${CMAKE_SOURCE_DIR}/../test/spawn-test.c
|
||||
)
|
||||
|
||||
set (test-exit_SOURCES
|
||||
${CMAKE_SOURCE_DIR}/../test/test-exit.c
|
||||
${CMAKE_SOURCE_DIR}/../test/test-exit.c
|
||||
)
|
||||
|
||||
set (test-segfault_SOURCES
|
||||
${CMAKE_SOURCE_DIR}/../test/test-segfault.c
|
||||
${CMAKE_SOURCE_DIR}/../test/test-segfault.c
|
||||
)
|
||||
|
||||
set (test-sleep-forever_SOURCES
|
||||
${CMAKE_SOURCE_DIR}/../test/test-sleep-forever.c
|
||||
${CMAKE_SOURCE_DIR}/../test/test-sleep-forever.c
|
||||
)
|
||||
|
||||
set (decode_gcov_SOURCES
|
||||
${CMAKE_SOURCE_DIR}/../test/decode-gcov.c
|
||||
${CMAKE_SOURCE_DIR}/../test/decode-gcov.c
|
||||
)
|
||||
|
||||
add_executable(test-service ${test-service_SOURCES})
|
||||
|
|
@ -80,50 +80,50 @@ target_link_libraries(test-sleep-forever ${DBUS_INTERNAL_LIBRARIES})
|
|||
|
||||
### keep these in creation order, i.e. uppermost dirs first
|
||||
set (TESTDIRS
|
||||
test/data
|
||||
test/data/auth
|
||||
test/data/equiv-config-files
|
||||
test/data/equiv-config-files/basic
|
||||
test/data/equiv-config-files/basic/basic.d
|
||||
test/data/equiv-config-files/entities
|
||||
test/data/equiv-config-files/entities/basic.d
|
||||
test/data/incomplete-messages
|
||||
test/data/invalid-config-files
|
||||
test/data/invalid-config-files-system
|
||||
test/data/invalid-messages
|
||||
test/data/invalid-service-files-system
|
||||
test/data/sha-1
|
||||
test/data/valid-config-files
|
||||
test/data/valid-config-files/basic.d
|
||||
test/data/valid-config-files/system.d
|
||||
test/data/valid-config-files-system
|
||||
test/data/valid-introspection-files
|
||||
test/data/valid-messages
|
||||
test/data/valid-service-files
|
||||
test/data/valid-service-files-system
|
||||
test/data
|
||||
test/data/auth
|
||||
test/data/equiv-config-files
|
||||
test/data/equiv-config-files/basic
|
||||
test/data/equiv-config-files/basic/basic.d
|
||||
test/data/equiv-config-files/entities
|
||||
test/data/equiv-config-files/entities/basic.d
|
||||
test/data/incomplete-messages
|
||||
test/data/invalid-config-files
|
||||
test/data/invalid-config-files-system
|
||||
test/data/invalid-messages
|
||||
test/data/invalid-service-files-system
|
||||
test/data/sha-1
|
||||
test/data/valid-config-files
|
||||
test/data/valid-config-files/basic.d
|
||||
test/data/valid-config-files/system.d
|
||||
test/data/valid-config-files-system
|
||||
test/data/valid-introspection-files
|
||||
test/data/valid-messages
|
||||
test/data/valid-service-files
|
||||
test/data/valid-service-files-system
|
||||
)
|
||||
set (CONFIG_VERBOSE 0)
|
||||
|
||||
### copy tests to builddir so that generated tests and static tests
|
||||
### are all in one place.
|
||||
MESSAGE(STATUS "Copying test files to test directory")
|
||||
MESSAGE(STATUS "Copying test files to test directory")
|
||||
FOREACH(FILE_TYPE *.message *.message-raw *.auth-script *.sha1 *.txt *.conf *.service)
|
||||
FOREACH(DIR ${TESTDIRS})
|
||||
FILE(GLOB FILES "${CMAKE_SOURCE_DIR}/../${DIR}/${FILE_TYPE}" )
|
||||
FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DIR})
|
||||
FOREACH(FILE ${FILES})
|
||||
GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME)
|
||||
SET (TARGET ${CMAKE_BINARY_DIR}/${DIR}/${FILENAME})
|
||||
configure_file(${FILE} ${TARGET} COPYONLY)
|
||||
IF (CONFIG_VERBOSE)
|
||||
MESSAGE("${FILE}")
|
||||
ENDIF (CONFIG_VERBOSE)
|
||||
ENDFOREACH(FILE)
|
||||
ENDFOREACH(DIR)
|
||||
FOREACH(DIR ${TESTDIRS})
|
||||
FILE(GLOB FILES "${CMAKE_SOURCE_DIR}/../${DIR}/${FILE_TYPE}" )
|
||||
FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DIR})
|
||||
FOREACH(FILE ${FILES})
|
||||
GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME)
|
||||
SET (TARGET ${CMAKE_BINARY_DIR}/${DIR}/${FILENAME})
|
||||
configure_file(${FILE} ${TARGET} COPYONLY)
|
||||
IF (CONFIG_VERBOSE)
|
||||
MESSAGE("${FILE}")
|
||||
ENDIF (CONFIG_VERBOSE)
|
||||
ENDFOREACH(FILE)
|
||||
ENDFOREACH(DIR)
|
||||
ENDFOREACH(FILE_TYPE)
|
||||
|
||||
### generate test files
|
||||
MESSAGE(STATUS "Generating test files from templates into test directory")
|
||||
MESSAGE(STATUS "Generating test files from templates into test directory")
|
||||
|
||||
FOREACH(FILE_TYPE *.conf.in *.service.in)
|
||||
FOREACH(DIR ${TESTDIRS})
|
||||
|
|
@ -145,18 +145,18 @@ FOREACH(FILE_TYPE *.conf.in *.service.in)
|
|||
ENDFOREACH(DIR)
|
||||
ENDFOREACH(FILE_TYPE)
|
||||
|
||||
MESSAGE(STATUS "Copying generated bus config files to test directory")
|
||||
MESSAGE(STATUS "Copying generated bus config files to test directory")
|
||||
set (OUTDIR ${CMAKE_BINARY_DIR}/test/data/valid-config-files)
|
||||
|
||||
FILE(GLOB FILES "${CMAKE_BINARY_DIR}/bus/*.conf" )
|
||||
FILE(MAKE_DIRECTORY ${OUTDIR})
|
||||
FOREACH(FILE ${FILES})
|
||||
GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME)
|
||||
SET (TARGET ${OUTDIR}/${FILENAME})
|
||||
configure_file(${FILE} ${TARGET} COPYONLY)
|
||||
IF (CONFIG_VERBOSE)
|
||||
MESSAGE("FROM: ${FILE}\nTO: ${TARGET}\n")
|
||||
ENDIF (CONFIG_VERBOSE)
|
||||
GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME)
|
||||
SET (TARGET ${OUTDIR}/${FILENAME})
|
||||
configure_file(${FILE} ${TARGET} COPYONLY)
|
||||
IF (CONFIG_VERBOSE)
|
||||
MESSAGE("FROM: ${FILE}\nTO: ${TARGET}\n")
|
||||
ENDIF (CONFIG_VERBOSE)
|
||||
ENDFOREACH(FILE)
|
||||
|
||||
# todo: for installation the TEST_..._BINARY variables must reflect the
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue