Use new keyword parameters for all calls to gnc_add_scheme_test_targets

This commit is contained in:
Geert Janssens 2020-03-14 10:30:35 +01:00
parent c05281c582
commit 06ff8a292d
8 changed files with 63 additions and 110 deletions

View File

@ -38,21 +38,17 @@ set(GUILE_DEPENDS
scm-engine)
gnc_add_scheme_test_targets(scm-test-engine-extras
"test-engine-extras.scm"
"tests"
"${GUILE_DEPENDS}"
FALSE
)
SOURCES "test-engine-extras.scm"
OUTPUT_DIR "tests"
DEPENDS "${GUILE_DEPENDS}")
# Module interfaces deprecated in 4.x, will be removed for 5.x
gnc_add_scheme_deprecated_module ("gnucash engine test test-extras" "tests test-engine-extras" "scm-test-engine-extras" "")
gnc_add_scheme_test_targets(scm-test-engine
"${bindings_test_SCHEME}"
"tests"
"${GUILE_DEPENDS};scm-test-engine-extras"
FALSE
)
SOURCES "${bindings_test_SCHEME}"
OUTPUT_DIR "tests"
DEPENDS "${GUILE_DEPENDS};scm-test-engine-extras")
add_dependencies(check scm-test-engine)
@ -60,11 +56,9 @@ gnc_add_scheme_tests("${engine_test_SCHEME}")
if (HAVE_SRFI64)
gnc_add_scheme_test_targets (scm-srfi64-extras
"srfi64-extras.scm"
"tests"
"${GUILE_DEPENDS};scm-test-engine-extras;scm-srfi64-extras"
FALSE
)
SOURCES "srfi64-extras.scm"
OUTPUT_DIR "tests"
DEPENDS "${GUILE_DEPENDS};scm-test-engine-extras;scm-srfi64-extras")
# Module interfaces deprecated in 4.x, will be removed for 5.x
gnc_add_scheme_deprecated_module ("gnucash engine test srfi64-extras" "tests srfi64-extras" "scm-srfi64-extras" "")
@ -74,11 +68,9 @@ if (HAVE_SRFI64)
)
gnc_add_scheme_test_targets (scm-test-with-srfi64
"${scm_tests_with_srfi64_SOURCES}"
"tests"
"${GUILE_DEPENDS};scm-test-engine-extras;scm-srfi64-extras;gnc-engine"
FALSE
)
SOURCES "${scm_tests_with_srfi64_SOURCES}"
OUTPUT_DIR "tests"
DEPENDS "${GUILE_DEPENDS};scm-test-engine-extras;scm-srfi64-extras;gnc-engine")
gnc_add_scheme_tests("${scm_tests_with_srfi64_SOURCES}")
add_dependencies(check scm-srfi64-extras)
@ -101,11 +93,9 @@ set(GUILE_DEPENDS
if (HAVE_SRFI64)
gnc_add_scheme_test_targets(scm-test-scm
"${test_scm_SCHEME}"
"tests"
"${GUILE_DEPENDS}"
FALSE
)
SOURCES "${test_scm_SCHEME}"
OUTPUT_DIR "tests"
DEPENDS "${GUILE_DEPENDS}")
gnc_add_scheme_tests("${test_scm_SCHEME}")

View File

@ -256,21 +256,8 @@ function(gnc_add_scheme_targets)
install(FILES ${_SOURCE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GUILE_REL_SITEDIR}/${_OUTPUT_DIR})
endfunction()
function(gnc_add_scheme_test_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
MAKE_LINKS)
if(MAKE_LINKS)
make_scheme_targets("${_TARGET}"
SOURCES "${_SOURCE_FILES}"
OUTPUT_DIR "${_OUTPUT_DIR}"
DEPENDS "${_GUILE_DEPENDS}"
MAKE_LINKS)
else()
make_scheme_targets("${_TARGET}"
SOURCES "${_SOURCE_FILES}"
OUTPUT_DIR "${_OUTPUT_DIR}"
DEPENDS "${_GUILE_DEPENDS}"
MAKE_LINKS)
endif()
function(gnc_add_scheme_test_targets _TARGET)
make_scheme_targets(${_TARGET} ${ARGN})
add_dependencies(check ${_TARGET})
endfunction()

View File

@ -60,11 +60,9 @@ set(GUILE_DEPENDS test-core-guile)
gnc_add_scheme_test_targets(scm-test-core
${test_core_SCHEME}
${GUILE_OUTPUT_DIR}
"${GUILE_DEPENDS}"
FALSE
)
SOURCES ${test_core_SCHEME}
OUTPUT_DIR ${GUILE_OUTPUT_DIR}
DEPENDS "${GUILE_DEPENDS}")
add_dependencies(check scm-test-core)

View File

@ -37,11 +37,9 @@ set(GUILE_DEPENDS
)
gnc_add_scheme_test_targets(scm-test-load-gnome-utils-module
"test-load-gnome-utils-module.scm"
"tests"
"${GUILE_DEPENDS}"
FALSE
)
SOURCES "test-load-gnome-utils-module.scm"
OUTPUT_DIR "tests"
DEPENDS "${GUILE_DEPENDS}")
gnc_add_scheme_tests(test-load-gnome-utils-module.scm)

View File

@ -23,11 +23,9 @@ if (HAVE_SRFI64)
gnc_add_scheme_tests("${scm_qifimp_test_with_srfi64_SOURCES}")
gnc_add_scheme_test_targets(scm-test-qif-imp-srfi64
"${scm_qifimp_test_with_srfi64_SOURCES}"
"tests"
"${GUILE_DEPENDS};scm-srfi64-extras"
FALSE
)
SOURCES "${scm_qifimp_test_with_srfi64_SOURCES}"
OUTPUT_DIR "tests"
DEPENDS "${GUILE_DEPENDS};scm-srfi64-extras")
add_dependencies(check scm-qif-import-2 scm-qif-import)
endif()

View File

@ -39,33 +39,27 @@ set(GUILE_DEPENDS
)
if (HAVE_SRFI64)
gnc_add_scheme_test_targets(scm-test-reports-standard-srfi64
"${scm_test_with_srfi64_SOURCES}"
"tests"
"${GUILE_DEPENDS};scm-srfi64-extras"
FALSE
)
gnc_add_scheme_test_targets(scm-test-reports-standard-srfi64
SOURCES "${scm_test_with_srfi64_SOURCES}"
OUTPUT_DIR "tests"
DEPENDS "${GUILE_DEPENDS};scm-srfi64-extras")
gnc_add_scheme_tests("${scm_test_with_srfi64_SOURCES}")
gnc_add_scheme_tests("${scm_test_with_srfi64_SOURCES}")
if (HAVE_TEXT_PORTS)
gnc_add_scheme_test_targets(scm-test-reports-standard-tp
"${scm_test_with_textual_ports_SOURCES}"
"tests"
"${GUILE_DEPENDS};scm-srfi64-extras"
FALSE
)
gnc_add_scheme_tests("${scm_test_with_textual_ports_SOURCES}")
endif()
if (HAVE_TEXT_PORTS)
gnc_add_scheme_test_targets(scm-test-reports-standard-tp
SOURCES "${scm_test_with_textual_ports_SOURCES}"
OUTPUT_DIR "tests"
DEPENDS "${GUILE_DEPENDS};scm-srfi64-extras")
gnc_add_scheme_tests("${scm_test_with_textual_ports_SOURCES}")
endif()
endif()
gnc_add_scheme_tests("${scm_test_reports_standard_SOURCES}")
gnc_add_scheme_test_targets(scm-test-reports-standard
"${scm_test_reports_standard_SOURCES}"
"tests"
"${GUILE_DEPENDS}"
FALSE
)
SOURCES "${scm_test_reports_standard_SOURCES}"
OUTPUT_DIR "tests"
DEPENDS "${GUILE_DEPENDS}")
add_dependencies(check scm-test-reports-standard)

View File

@ -38,29 +38,23 @@ set(GUILE_DEPENDS
gnc_add_scheme_tests("${scm_test_report_SOURCES}")
if (HAVE_SRFI64)
gnc_add_scheme_test_targets(scm-test-report-srfi64
"${scm_test_report_with_srfi64_SOURCES}"
"tests"
"${GUILE_DEPENDS};scm-srfi64-extras"
FALSE
)
gnc_add_scheme_test_targets(scm-test-report-srfi64
SOURCES "${scm_test_report_with_srfi64_SOURCES}"
OUTPUT_DIR "tests"
DEPENDS "${GUILE_DEPENDS};scm-srfi64-extras")
gnc_add_scheme_tests ("${scm_test_report_with_srfi64_SOURCES}")
gnc_add_scheme_tests ("${scm_test_report_with_srfi64_SOURCES}")
endif()
gnc_add_scheme_test_targets(scm-test-report
"test-report-extras.scm"
"tests"
"${GUILE_DEPENDS}"
FALSE
)
SOURCES "test-report-extras.scm"
OUTPUT_DIR "tests"
DEPENDS "${GUILE_DEPENDS}")
gnc_add_scheme_test_targets(scm-test-report-2
"${scm_test_report_SOURCES}"
"tests"
"scm-test-report"
FALSE
)
SOURCES "${scm_test_report_SOURCES}"
OUTPUT_DIR "tests"
DEPENDS "scm-test-report")
add_dependencies(check scm-test-report)
set_dist_list(test_report_DIST

View File

@ -48,30 +48,24 @@ set (test_app_utils_scheme_SRFI64_SOURCES
)
gnc_add_scheme_test_targets(scm-test-load-app-utils-module
"test-load-app-utils-module.scm"
"tests"
"${GUILE_DEPENDS}"
FALSE
)
SOURCES "test-load-app-utils-module.scm"
OUTPUT_DIR "tests"
DEPENDS "${GUILE_DEPENDS}")
gnc_add_scheme_test_targets(scm-test-c-interface
"test-c-interface.scm"
"tests"
"${GUILE_DEPENDS}"
FALSE
)
SOURCES "test-c-interface.scm"
OUTPUT_DIR "tests"
DEPENDS "${GUILE_DEPENDS}")
gnc_add_scheme_tests("${test_app_utils_scheme_SOURCES}")
if (HAVE_SRFI64)
gnc_add_scheme_test_targets(scm-test-app-utils-srfi64
"${test_app_utils_scheme_SRFI64_SOURCES}"
"tests"
"${GUILE_DEPENDS};scm-srfi64-extras"
FALSE
)
gnc_add_scheme_test_targets(scm-test-app-utils-srfi64
SOURCES "${test_app_utils_scheme_SRFI64_SOURCES}"
OUTPUT_DIR "tests"
DEPENDS "${GUILE_DEPENDS};scm-srfi64-extras")
gnc_add_scheme_tests("${test_app_utils_scheme_SRFI64_SOURCES}")
gnc_add_scheme_tests("${test_app_utils_scheme_SRFI64_SOURCES}")
endif()
# Doesn't work yet: