summary refs log tree commit diff
diff options
context:
space:
mode:
authorzimoun <zimon.toutoune@gmail.com>2022-02-23 14:47:07 +0100
committerEfraim Flashner <efraim@flashner.co.il>2022-02-24 12:20:32 +0200
commit1f6ae9a8e02c457ee499e61f78c8a282ab9d4971 (patch)
treee1d655813c755aefaaebff258b695cbd01ba8b99
parent38522ff4064d3b9dbfdc032973249d1e0a957e49 (diff)
downloadguix-1f6ae9a8e02c457ee499e61f78c8a282ab9d4971.tar.gz
build: julia-build-system: Fix corner-case for parallel tests.
* guix/build/julia-build-system.scm (check): Do not run parallel tests when
'--cores=1'.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
-rw-r--r--guix/build/julia-build-system.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/guix/build/julia-build-system.scm b/guix/build/julia-build-system.scm
index c5ad65d029..b0dac154e9 100644
--- a/guix/build/julia-build-system.scm
+++ b/guix/build/julia-build-system.scm
@@ -112,9 +112,9 @@ Project.toml)."
            (job-count (if parallel-tests?
                           (parallel-job-count)
                           1))
-           ;; The --proc argument of Julia *adds* extra processors rather than
-           ;; specify the exact count to use, so zero must be specified to
-           ;; disable parallel processing...
+           ;; The --procs argument of Julia *adds* extra processors rather
+           ;; than specify the exact count to use, so zero must be specified
+           ;; to disable parallel processing...
            (additional-procs (max 0 (1- job-count))))
       ;; With a patch, SOURCE_DATE_EPOCH is honored
       (setenv "SOURCE_DATE_EPOCH" "1")
@@ -127,7 +127,7 @@ Project.toml)."
       (setenv "HOME" "/tmp")
       (apply invoke "julia"
              `("--depwarn=yes"
-               ,@(if parallel-tests?
+               ,@(if (and parallel-tests? (< 0 additional-procs))
                      ;; XXX: ... but '--procs' doesn't accept 0 as a valid
                      ;; value, so just omit the argument entirely.
                      (list (string-append  "--procs="