diff options
| author | Ludovic Courtès <ludovic.courtes@inria.fr> | 2019-07-02 10:30:23 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-07-04 18:05:02 +0200 |
| commit | dea62932bc929243dae5e8b08f4fbe0b6f70be95 (patch) | |
| tree | d9821aba6a2ac4c4e1577d005850d6f3c7496bce /gnu/tests/singularity.scm | |
| parent | b9fcf0c82a14df48c7c6f36a08dbdcd3184fcbf8 (diff) | |
pack: 'squashfs' backend records the profile's search paths.
* guix/scripts/pack.scm (singularity-environment-file): New procedure.
(squashfs-image): Use it, and create /.singularity/env/90-environment.sh.
* gnu/tests/singularity.scm (run-singularity-test)["singularity run,
with environment"]: New test, currently skipped.
* gnu/tests/singularity.scm (build-tarball&run-singularity-test): Add
GUILE-JSON to the profile.
Diffstat (limited to 'gnu/tests/singularity.scm')
| -rw-r--r-- | gnu/tests/singularity.scm | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/gnu/tests/singularity.scm b/gnu/tests/singularity.scm index 668043a0bc0..2f3a6f289db 100644 --- a/gnu/tests/singularity.scm +++ b/gnu/tests/singularity.scm | |||
| @@ -111,6 +111,21 @@ | |||
| 111 | "run" #$image "-c" "(exit 42)")) | 111 | "run" #$image "-c" "(exit 42)")) |
| 112 | marionette)) | 112 | marionette)) |
| 113 | 113 | ||
| 114 | ;; FIXME: Singularity 2.x doesn't directly honor | ||
| 115 | ;; /.singularity.d/env/*.sh. Instead, you have to load those files | ||
| 116 | ;; manually, which we don't do. Remove 'test-skip' call once we've | ||
| 117 | ;; switch to Singularity 3.x. | ||
| 118 | (test-skip 1) | ||
| 119 | (test-equal "singularity run, with environment" | ||
| 120 | 0 | ||
| 121 | (marionette-eval | ||
| 122 | ;; Check whether GUILE_LOAD_PATH is properly set, allowing us to | ||
| 123 | ;; find the (json) module. | ||
| 124 | `(status:exit-val | ||
| 125 | (system* #$(file-append singularity "/bin/singularity") | ||
| 126 | "--debug" "run" #$image "-c" "(use-modules (json))")) | ||
| 127 | marionette)) | ||
| 128 | |||
| 114 | (test-end) | 129 | (test-end) |
| 115 | (exit (= (test-runner-fail-count (test-runner-current)) 0))))) | 130 | (exit (= (test-runner-fail-count (test-runner-current)) 0))))) |
| 116 | 131 | ||
| @@ -122,7 +137,8 @@ | |||
| 122 | (guile (set-guile-for-build (default-guile))) | 137 | (guile (set-guile-for-build (default-guile))) |
| 123 | ;; 'singularity exec' insists on having /bin/sh in the image. | 138 | ;; 'singularity exec' insists on having /bin/sh in the image. |
| 124 | (profile (profile-derivation (packages->manifest | 139 | (profile (profile-derivation (packages->manifest |
| 125 | (list bash-minimal guile-2.2)) | 140 | (list bash-minimal |
| 141 | guile-2.2 guile-json)) | ||
| 126 | #:hooks '() | 142 | #:hooks '() |
| 127 | #:locales? #f)) | 143 | #:locales? #f)) |
| 128 | (tarball (squashfs-image "singularity-pack" profile | 144 | (tarball (squashfs-image "singularity-pack" profile |
