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 | |
| parent | b9fcf0c82a14df48c7c6f36a08dbdcd3184fcbf8 (diff) | |
| download | gnu-guix-dea62932bc929243dae5e8b08f4fbe0b6f70be95.tar gnu-guix-dea62932bc929243dae5e8b08f4fbe0b6f70be95.tar.gz | |
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')
| -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 668043a0bc..2f3a6f289d 100644 --- a/gnu/tests/singularity.scm +++ b/gnu/tests/singularity.scm @@ -111,6 +111,21 @@ "run" #$image "-c" "(exit 42)")) marionette)) + ;; FIXME: Singularity 2.x doesn't directly honor + ;; /.singularity.d/env/*.sh. Instead, you have to load those files + ;; manually, which we don't do. Remove 'test-skip' call once we've + ;; switch to Singularity 3.x. + (test-skip 1) + (test-equal "singularity run, with environment" + 0 + (marionette-eval + ;; Check whether GUILE_LOAD_PATH is properly set, allowing us to + ;; find the (json) module. + `(status:exit-val + (system* #$(file-append singularity "/bin/singularity") + "--debug" "run" #$image "-c" "(use-modules (json))")) + marionette)) + (test-end) (exit (= (test-runner-fail-count (test-runner-current)) 0))))) @@ -122,7 +137,8 @@ (guile (set-guile-for-build (default-guile))) ;; 'singularity exec' insists on having /bin/sh in the image. (profile (profile-derivation (packages->manifest - (list bash-minimal guile-2.2)) + (list bash-minimal + guile-2.2 guile-json)) #:hooks '() #:locales? #f)) (tarball (squashfs-image "singularity-pack" profile |