me
/
guix
Archived
1
0
Fork 0
Code

gnu: rust-1.28: Remove disable-cargo-test-for-nightly-channel phase. 

* gnu/packages/rust.scm (rust-1.28)[arguments]: Remove custom
'disable-cargo-test-for-nightly-channel phase.
(rust-1.40)[arguments]: Don't remove removed phase.
master
Efraim Flashner 2020-07-28 10:55:03 +03:00
parent bbee4490d9
commit 810f4cc187
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/packages/rust.scm
View File

@ -800,7 +800,6 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(("fn finds_author_git") "#[ignore]\nfn finds_author_git") (("fn finds_author_git") "#[ignore]\nfn finds_author_git")
(("fn finds_local_author_git") "#[ignore]\nfn finds_local_author_git")) (("fn finds_local_author_git") "#[ignore]\nfn finds_local_author_git"))
#t)) #t))
;; TODO(rebuild-rust): Remove this phase in rust-1.28 when rebuilding.
(add-after 'patch-cargo-tests 'disable-cargo-test-for-nightly-channel (add-after 'patch-cargo-tests 'disable-cargo-test-for-nightly-channel
(lambda* _ (lambda* _
;; This test failed to work on "nightly" channel builds ;; This test failed to work on "nightly" channel builds
@ -880,6 +879,8 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(substitute* "src/test/run-pass/issue-44056.rs" (substitute* "src/test/run-pass/issue-44056.rs"
(("only-x86_64") "ignore-test")) (("only-x86_64") "ignore-test"))
#t)) #t))
;; This is no longer needed as of 1.28
(delete 'disable-cargo-test-for-nightly-channel)
;; The thinlto test should pass with llvm 6. ;; The thinlto test should pass with llvm 6.
(delete 'disable-thinlto-test)))))))) (delete 'disable-thinlto-test))))))))
@ -1249,8 +1250,6 @@ move around."
,(patch-command-exec-tests-phase ,(patch-command-exec-tests-phase
'(match (find-files "src/test" "command-exec\\.rs") '(match (find-files "src/test" "command-exec\\.rs")
((file) file)))) ((file) file))))
;; TODO(rebuild-rust): The test in question got fixed long ago.
(delete 'disable-cargo-test-for-nightly-channel)
;; The test got removed in commit 000fe63b6fc57b09828930cacbab20c2ee6e6d15 ;; The test got removed in commit 000fe63b6fc57b09828930cacbab20c2ee6e6d15
;; "Remove painful test that is not pulling its weight" ;; "Remove painful test that is not pulling its weight"
(delete 'remove-unsupported-tests))))))))) (delete 'remove-unsupported-tests)))))))))