diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2015-11-03 00:23:56 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2015-11-03 14:22:30 +0100 |
| commit | 34d0c73f998281467ead1b3e185f5b53df6d221f (patch) | |
| tree | 0c37035476fe1ded6d3806b9646e05937ed7f725 /cmake | |
| parent | 78545a32c57f7b1571dd10e20a049cb0caf705e6 (diff) | |
Test system bus config files on Unix only
Previously, we didn't consistently test parsing of every file in
valid-config-files-system/ everywhere that we tested valid-config-files/.
We now test it on Unix.
The system bus is not supported on Windows, so we do not test
valid-config-files-system/ there.
valid-config-files/many-rules.conf contains <user> and <group> rules
which are not applicable to Windows. Copy the original many-rules.conf
to valid-config-files-system/ so that it will be tested on Unix, and
remove the non-portable rules from valid-config-files/many-rules.conf.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92721
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
[rh:base patch came from Simon]
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/test/CMakeLists.txt | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index 1a12f5a8..eb4b1f10 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -122,8 +122,8 @@ set (TESTDIRS test/data/valid-config-files test/data/valid-config-files/basic.d test/data/valid-config-files/session.d - test/data/valid-config-files/system.d test/data/valid-config-files-system + test/data/valid-config-files-system/system.d test/data/valid-introspection-files test/data/valid-messages test/data/valid-service-files @@ -140,13 +140,16 @@ set (TESTDIRS ) set (CONFIG_VERBOSE 0) +FOREACH(DIR ${TESTDIRS}) + FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DIR}) +ENDFOREACH(DIR) + ### copy tests to builddir so that generated tests and static tests ### are all in one place. 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}) @@ -164,7 +167,6 @@ MESSAGE(STATUS "Generating test files from templates into test directory") FOREACH(FILE_TYPE *.conf.in *.service.in) 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) STRING(REGEX REPLACE "\\.in$" "" FILENAME ${FILENAME}) @@ -178,19 +180,5 @@ FOREACH(FILE_TYPE *.conf.in *.service.in) ENDFOREACH(FILE_TYPE) MESSAGE(STATUS "Copying generated bus config files to test directory") -set (OUTDIR ${CMAKE_BINARY_DIR}/test/data/valid-config-files) - -SET(FILES - "${CMAKE_SOURCE_DIR}/../bus/session.conf.in" - "${CMAKE_SOURCE_DIR}/../bus/system.conf.in" -) -FILE(MAKE_DIRECTORY ${OUTDIR}) -FOREACH(FILE ${FILES}) - GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME) - STRING(REGEX REPLACE "\\.in$" "" FILENAME ${FILENAME}) - SET (TARGET ${OUTDIR}/${FILENAME}) - configure_file(${FILE} ${TARGET} @ONLY) - IF (CONFIG_VERBOSE) - MESSAGE("FROM: ${FILE}\nTO: ${TARGET}\n") - ENDIF (CONFIG_VERBOSE) -ENDFOREACH(FILE) +configure_file("${CMAKE_SOURCE_DIR}/../bus/session.conf.in" ${CMAKE_BINARY_DIR}/test/data/valid-config-files/session.conf @ONLY) +configure_file("${CMAKE_SOURCE_DIR}/../bus/system.conf.in" ${CMAKE_BINARY_DIR}/test/data/valid-config-files-system/system.conf @ONLY) |