Commit 9af9d736 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

CMake: rename variables to be more coherent

parent 66d3c9a6

cmake/AllpixMacros.cmake

+3 −3
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ MACRO(ALLPIX_MODULE_TESTS name directory) 
    # Get the name of the module

    GET_FILENAME_COMPONENT(_allpix_module_dir ${CMAKE_CURRENT_SOURCE_DIR} NAME)



    SET(TEST_BASE_DIRECTORY "${PROJECT_BINARY_DIR}/testing")

    SET(TEST_BASE_DIR "${PROJECT_BINARY_DIR}/testing")

    IF(TEST_MODULES)

        FILE(

            GLOB AUX_FILES_MODULES
@@ -322,12 +322,12 @@ MACRO(ALLPIX_MODULE_TESTS name directory) 
        # Copy and configure tests

        FOREACH(test ${TEST_LIST_MODULES})

            GET_FILENAME_COMPONENT(title ${test} NAME_WE)

            SET(TEST_DIRECTORY "${TEST_BASE_DIRECTORY}/modules/${_allpix_module_dir}/${title}")

            SET(TEST_DIR "${TEST_BASE_DIR}/modules/${_allpix_module_dir}/${title}")



            CONFIGURE_FILE(${test} "${CMAKE_CURRENT_BINARY_DIR}/${test}" @ONLY)

            ADD_ALLPIX_TEST(NAME "modules/${_allpix_module_dir}/${title}"

                            FILE ${CMAKE_CURRENT_BINARY_DIR}/${test}

                            WORKING_DIRECTORY ${TEST_BASE_DIRECTORY})

                            WORKING_DIRECTORY ${TEST_BASE_DIR})



            GET_PROPERTY(old_count GLOBAL PROPERTY COUNT_TESTS_MODULES)

            MATH(EXPR new_count "${old_count}+1")

doc/usermanual/chapters/testing.tex

+2 −2
Original line number Diff line number Diff line
@@ -307,8 +307,8 @@ Variables can be used both in test files and the auxiliary configuration files s 
The following variables are available:



\begin{description}

  \item[\parameter{@TEST_DIRECTORY@}:] Directory in which the current test is executed, i.e. where all output files will be placed.

  \item[\parameter{@TEST_BASE_DIRECTORY@}:] Base directory under which all tests are being executed. This can be used to reference the output files from another test. it should be noted that the respective test has to be referenced using the \parameter{#DEPENDS} keyword to ensure that it successfully ran before.

  \item[\parameter{@TEST_DIR@}:] Directory in which the current test is executed, i.e. where all output files will be placed.

  \item[\parameter{@TEST_BASE_DIR@}:] Base directory under which all tests are being executed. This can be used to reference the output files from another test. it should be noted that the respective test has to be referenced using the \parameter{#DEPENDS} keyword to ensure that it successfully ran before.

  \item[\parameter{@PROJECT_SOURCE_DIR@}:] The root directory of the project. This can for example be used to call a script provided in the \dir{etc/scripts} directory of the repository.

\end{description}