me/guix
Archived
1
0
Fork 0
Code Activity

gnu: fenics-dolfin: Honor #:tests? flag.

Browse source 
* gnu/packages/simulation.scm (fenics-dolfin)[source]: Remove trailing
boolean.
[arguments]: Adjust custom 'check' phase to honor the #:tests? flag. While
here, remove trailing booleans.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Paul A. Patience 2022-04-22 20:25:44 +00:00 • committed by Ludovic Courtès
parent a2d44231ea
commit 69505bec93
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/simulation.scm
View file

@ -448,8 +448,7 @@ FFC is part of the FEniCS Project.")
;; Specify directory to find the header file. ;; Specify directory to find the header file.
(("(^set\\(CATCH_INCLUDE_DIR ).*(/catch\\))" _ front back) (("(^set\\(CATCH_INCLUDE_DIR ).*(/catch\\))" _ front back)
(string-append front (string-append front
"$ENV{CATCH_DIR}/include" back "\n"))) "$ENV{CATCH_DIR}/include" back "\n")))))))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("blas" ,openblas) `(("blas" ,openblas)
@ -494,8 +493,7 @@ FFC is part of the FEniCS Project.")
(setenv "SLEPC_DIR" (assoc-ref %build-inputs "slepc")) (setenv "SLEPC_DIR" (assoc-ref %build-inputs "slepc"))
(setenv "SCOTCH_DIR" (assoc-ref %build-inputs "scotch")) (setenv "SCOTCH_DIR" (assoc-ref %build-inputs "scotch"))
(setenv "SUNDIALS_DIR" (assoc-ref %build-inputs "sundials")) (setenv "SUNDIALS_DIR" (assoc-ref %build-inputs "sundials"))
(setenv "UMFPACK_DIR" (assoc-ref %build-inputs "suitesparse")) (setenv "UMFPACK_DIR" (assoc-ref %build-inputs "suitesparse"))))
#t))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
;; The Dolfin repository uses git-lfs, whereby web links are ;; The Dolfin repository uses git-lfs, whereby web links are
@ -546,15 +544,15 @@ FFC is part of the FEniCS Project.")
"demo_mesh-quality_serial " "demo_mesh-quality_serial "
"demo_mesh-quality_mpi " "demo_mesh-quality_mpi "
"demo_multimesh-stokes_serial " "demo_multimesh-stokes_serial "
")\n") port))) ")\n") port)))))
#t))
(replace 'check (replace 'check
(lambda _ (lambda* (#:key tests? #:allow-other-keys)
(and (invoke "make" "unittests") (when tests?
(invoke "make" "demos") (invoke "make" "unittests")
(invoke "ctest" "-R" "unittests") (invoke "make" "demos")
(invoke "ctest" "-R" "demo" "-R" "serial") (invoke "ctest" "-R" "unittests")
(invoke "ctest" "-R" "demo" "-R" "mpi"))))))) (invoke "ctest" "-R" "demo" "-R" "serial")
(invoke "ctest" "-R" "demo" "-R" "mpi")))))))
(home-page "https://bitbucket.org/fenics-project/dolfin/") (home-page "https://bitbucket.org/fenics-project/dolfin/")
(synopsis "Problem solving environment for differential equations") (synopsis "Problem solving environment for differential equations")
(description (description