Commit c91435e3 authored by Håkan Wennlöf's avatar Håkan Wennlöf
Browse files

Merge branch 'p-cmake-test' into 'master' 

CMake: Only include tests with proper extensions

See merge request allpix-squared/allpix-squared!1049
parents c8011a0e c9925d0f

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -44,3 +44,6 @@ 


# Ignore files created from unit tests

/etc/unittests/output/



# Ignore merge conflict original copies

*.orig

etc/unittests/CMakeLists.txt

+10 −4
Original line number Diff line number Diff line
@@ -13,8 +13,11 @@ IF(TEST_PERFORMANCE) 
    LIST(LENGTH TEST_LIST_PERFORMANCE NUM_TEST_PERFORMANCE)

    SET_PROPERTY(GLOBAL PROPERTY COUNT_TESTS_PERFORMANCE "${NUM_TEST_PERFORMANCE}")

    FOREACH(test ${TEST_LIST_PERFORMANCE})

        GET_FILENAME_COMPONENT(ext ${test} LAST_EXT)

        IF("${ext}" STREQUAL ".conf")

            GET_FILENAME_COMPONENT(title ${test} NAME_WE)

            ADD_ALLPIX_TEST(NAME "performance/${title}" FILE ${CMAKE_CURRENT_SOURCE_DIR}/${test})

        ENDIF()

    ENDFOREACH()

    SET_PROPERTY(GLOBAL PROPERTY PERF_TEST_DESCRIPTIONS "${TEST_DESCRIPTIONS}")

    SET(TEST_DESCRIPTIONS "")
@@ -32,8 +35,11 @@ IF(TEST_CORE) 
    LIST(LENGTH TEST_LIST_CORE NUM_TEST_CORE)

    SET_PROPERTY(GLOBAL PROPERTY COUNT_TESTS_CORE "${NUM_TEST_CORE}")

    FOREACH(test ${TEST_LIST_CORE})

        GET_FILENAME_COMPONENT(ext ${test} LAST_EXT)

        IF("${ext}" STREQUAL ".conf")

            GET_FILENAME_COMPONENT(title ${test} NAME_WE)

            ADD_ALLPIX_TEST(NAME "core/${title}" FILE ${CMAKE_CURRENT_SOURCE_DIR}/${test})

        ENDIF()

    ENDFOREACH()

    SET_PROPERTY(GLOBAL PROPERTY CORE_TEST_DESCRIPTIONS "${TEST_DESCRIPTIONS}")

    SET(TEST_DESCRIPTIONS "")