nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: rust: Enable more tests. 

* gnu/packages/rust.scm (rust-1.19)[arguments]<#:phases>[set-env]: Modify.
(rust-1.23)<#:phases>[patch-cargo-tests]: New phase.
(rust-1.23)<#:phases>[check]: Enable more tests.
This commit is contained in:
Nikolai Merinov 2018-04-15 10:05:14 +02:00 committed by Danny Milosavljevic
parent eb357e24f7
commit 1bb23335e6
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/rust.scm
View File

@ -161,9 +161,12 @@ in turn be used to build the final Rust.")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'set-env (add-after 'unpack 'set-env
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
;; Disable test for cross compilation support.
(setenv "CFG_DISABLE_CROSS_TESTS" "1")
(setenv "SHELL" (which "sh")) (setenv "SHELL" (which "sh"))
(setenv "CONFIG_SHELL" (which "sh")) (setenv "CONFIG_SHELL" (which "sh"))
(setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
;; guix llvm-3.9.1 package installs only shared libraries ;; guix llvm-3.9.1 package installs only shared libraries
(setenv "LLVM_LINK_SHARED" "1") (setenv "LLVM_LINK_SHARED" "1")
#t)) #t))
@ -258,7 +261,17 @@ safety and thread safety guarantees.")
(substitute-keyword-arguments (package-arguments rust-1.19) (substitute-keyword-arguments (package-arguments rust-1.19)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'patch-tests 'fix-mtime-bug (add-after 'patch-tests 'patch-cargo-tests
(lambda _
(substitute* "src/tools/cargo/tests/build.rs"
(("/usr/bin/env") (which "env"))
;; Guix llvm is compiled without asmjs-unknown-emscripten.
(("fn wasm32_final_outputs") "#[ignore]\nfn wasm32_final_outputs"))
(substitute* "src/tools/cargo/tests/death.rs"
;; This is stuck when built in container.
(("fn ctrl_c_kills_everyone") "#[ignore]\nfn ctrl_c_kills_everyone"))
#t))
(add-after 'patch-cargo-tests 'fix-mtime-bug
(lambda* _ (lambda* _
(substitute* "src/build_helper/lib.rs" (substitute* "src/build_helper/lib.rs"
;; Bug in Rust code. ;; Bug in Rust code.
@ -327,7 +340,8 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(invoke "./x.py" "build" "src/tools/cargo"))) (invoke "./x.py" "build" "src/tools/cargo")))
(replace 'check (replace 'check
(lambda* _ (lambda* _
(invoke "./x.py" "test"))) (invoke "./x.py" "test")
(invoke "./x.py" "test" "src/tools/cargo")))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(invoke "./x.py" "install") (invoke "./x.py" "install")