From 06ff8a292d8f258f0f706fa6f09c7297e057de31 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Sat, 14 Mar 2020 10:30:35 +0100 Subject: [PATCH] Use new keyword parameters for all calls to gnc_add_scheme_test_targets --- bindings/guile/test/CMakeLists.txt | 40 +++++++------------ .../cmake_modules/GncAddSchemeTargets.cmake | 17 +------- common/test-core/CMakeLists.txt | 8 ++-- gnucash/gnome-utils/test/CMakeLists.txt | 8 ++-- .../import-export/qif-imp/test/CMakeLists.txt | 8 ++-- .../reports/standard/test/CMakeLists.txt | 36 +++++++---------- gnucash/report/test/CMakeLists.txt | 28 +++++-------- libgnucash/app-utils/test/CMakeLists.txt | 28 +++++-------- 8 files changed, 63 insertions(+), 110 deletions(-) diff --git a/bindings/guile/test/CMakeLists.txt b/bindings/guile/test/CMakeLists.txt index 45e77bfbde..513d81ab66 100644 --- a/bindings/guile/test/CMakeLists.txt +++ b/bindings/guile/test/CMakeLists.txt @@ -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}") diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake index ac8e67b985..cc950befaf 100644 --- a/common/cmake_modules/GncAddSchemeTargets.cmake +++ b/common/cmake_modules/GncAddSchemeTargets.cmake @@ -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() diff --git a/common/test-core/CMakeLists.txt b/common/test-core/CMakeLists.txt index dc05fb7d20..23f60addfa 100644 --- a/common/test-core/CMakeLists.txt +++ b/common/test-core/CMakeLists.txt @@ -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) diff --git a/gnucash/gnome-utils/test/CMakeLists.txt b/gnucash/gnome-utils/test/CMakeLists.txt index 03be6eb42c..76c9f38501 100644 --- a/gnucash/gnome-utils/test/CMakeLists.txt +++ b/gnucash/gnome-utils/test/CMakeLists.txt @@ -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) diff --git a/gnucash/import-export/qif-imp/test/CMakeLists.txt b/gnucash/import-export/qif-imp/test/CMakeLists.txt index 005ba5c4f3..cbf33eeb1b 100644 --- a/gnucash/import-export/qif-imp/test/CMakeLists.txt +++ b/gnucash/import-export/qif-imp/test/CMakeLists.txt @@ -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() diff --git a/gnucash/report/reports/standard/test/CMakeLists.txt b/gnucash/report/reports/standard/test/CMakeLists.txt index 2ac1394fda..4f6601376d 100644 --- a/gnucash/report/reports/standard/test/CMakeLists.txt +++ b/gnucash/report/reports/standard/test/CMakeLists.txt @@ -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) diff --git a/gnucash/report/test/CMakeLists.txt b/gnucash/report/test/CMakeLists.txt index 27fbdea0b7..2ac920ad3b 100644 --- a/gnucash/report/test/CMakeLists.txt +++ b/gnucash/report/test/CMakeLists.txt @@ -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 diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt index 8c4da4e5f3..96fab0369a 100644 --- a/libgnucash/app-utils/test/CMakeLists.txt +++ b/libgnucash/app-utils/test/CMakeLists.txt @@ -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: