Patch adapted from upstream c3915bb99638c1ccf57217097b14b5db69bcac96 by Milan Crha: PrintableOptions.cmake: Correct variable name comparison CMake 3.20.1 errors out with: CMake Error at cmake/modules/PrintableOptions.cmake:38 (message): variable name cannot be empty Call Stack (most recent call first): CMakeLists.txt:152 (add_printable_variable) Change how the parameter value is compared, to fix it. --- a/cmake/modules/PrintableOptions.cmake +++ b/cmake/modules/PrintableOptions.cmake @@ -19,32 +19,32 @@ # prints all the build options previously added with the above functions macro(add_printable_variable_bare _name) - if(_name STREQUAL "") + if("${_name}" STREQUAL "") message(FATAL_ERROR "variable name cannot be empty") - endif(_name STREQUAL "") + endif("${_name}" STREQUAL "") list(APPEND _printable_options ${_name}) endmacro() macro(add_printable_option _name _description _default_value) - if(_name STREQUAL "") + if("${_name}" STREQUAL "") message(FATAL_ERROR "option name cannot be empty") - endif(_name STREQUAL "") + endif("${_name}" STREQUAL "") option(${_name} ${_description} ${_default_value}) add_printable_variable_bare(${_name}) endmacro() macro(add_printable_variable _name _description _default_value) - if(_name STREQUAL "") + if("${_name}" STREQUAL "") message(FATAL_ERROR "variable name cannot be empty") - endif(_name STREQUAL "") + endif("${_name}" STREQUAL "") set(${_name} ${_default_value} CACHE STRING ${_description}) add_printable_variable_bare(${_name}) endmacro() macro(add_printable_variable_path _name _description _default_value) - if(_name STREQUAL "") + if("${_name}" STREQUAL "") message(FATAL_ERROR "path variable name cannot be empty") - endif(_name STREQUAL "") + endif("${_name}" STREQUAL "") set(${_name} ${_default_value} CACHE PATH ${_description}) add_printable_variable_bare(${_name}) endmacro() path'>path: root/gnu/platform.scm
/td>
AgeCommit message (Expand)Author
2021-10-11gnu: Add platform support....* gnu/platform.scm: New file. * gnu/platforms/arm.scm: Ditto. * gnu/platforms/hurd.scm: Ditto. * gnu/local.mk (GNU_SYSTEM_MODULES): Add them. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Mathieu Othacehe
tests: Fix malformed JSON....Guile-JSON 4.3.2 would parse in spite of these typos, but 4.4.1 is stricter. * tests/swh.scm (%directory-entries): Add missing comma. * tests/cve-sample.json: Likewise. Ludovic Courtès
2020-02-27swh: Adjust 'origin' test....This is a followup to 3d2f29382de2d0ee852745cc002dfe2b5d22e1c2. * tests/swh.scm (%origin): Remove "id". ("lookup-origin"): Remove use of 'origin-id'. Ludovic Courtès
2019-09-02swh: Add hooks for rate limiting handling....* guix/swh.scm (%allow-request?, %save-rate-limit-reset-time) (%general-rate-limit-reset-time): New variables. (request-rate-limit-reached?, update-rate-limit-reset-time!): New procedures. (call): Call '%allow-request?'. Change 'swh-error' protocol to pass METHOD in addition to URL. * tests/swh.scm ("rate limit reached") ("%allow-request? and request-rate-limit-reached?"): New tests. Ludovic Courtès
2019-09-02tests: 'with-http-server' accepts multiple responses....* guix/tests/http.scm (call-with-http-server): Replace 'code' and 'data' parameters with 'responses+data'. Compute RESPONSES as a function of that. Remove #:headers parameter. [http-write]: Quit only when RESPONSES is empty. [server-body]: Get the response and data from RESPONSES, and set it to point to the rest. (with-http-server): Adjust accordingly. * tests/derivations.scm ("'download' built-in builder") ("'download' built-in builder, invalid hash") ("'download' built-in builder, not found") ("'download' built-in builder, check mode"): Adjust to new 'with-http-server' interface. * tests/lint.scm ("home-page: 200") ("home-page: 200 but short length") ("home-page: 404", "home-page: 301, invalid"): ("home-page: 301 -> 200", "home-page: 301 -> 404") ("source: 200", "source: 200 but short length") ("source: 404", "source: 404 and 200") ("source: 301 -> 200", "source: 301 -> 404"): ("github-url", github-url): Likewise. * tests/swh.scm (with-json-result) ("lookup-origin, not found"): Likewise. Ludovic Courtès
2019-07-22swh: Add basic tests....* guix/swh.scm (%swh-base-url): Turn into a parameter and export it. * tests/swh.scm: New file. * Makefile.am (SCM_TESTS): Add it. Ludovic Courtès