diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-02-19 23:12:03 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-02-19 23:12:03 +0000 |
| commit | c30463643e0f18200197fa7fc700805eac4d020c (patch) | |
| tree | 599f32d5195512f7b700bb1f68abdbda7ee45281 /user/rust/0014-test-invalid_const_promotion-Accept-SIGTRAP-as-a-val.patch | |
| parent | 3e7e0ccf80173731eef6d51f8a261b6058bfad72 (diff) | |
| parent | 3ad04696702c67ecbb84ee44d20b2489d77d841f (diff) | |
| download | packages-c30463643e0f18200197fa7fc700805eac4d020c.tar.gz packages-c30463643e0f18200197fa7fc700805eac4d020c.tar.bz2 packages-c30463643e0f18200197fa7fc700805eac4d020c.tar.xz packages-c30463643e0f18200197fa7fc700805eac4d020c.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.31.1
This needs updated binaries from https://portage.smaeul.xyz/distfiles/adelie/
See merge request !131
Diffstat (limited to 'user/rust/0014-test-invalid_const_promotion-Accept-SIGTRAP-as-a-val.patch')
| -rw-r--r-- | user/rust/0014-test-invalid_const_promotion-Accept-SIGTRAP-as-a-val.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/user/rust/0014-test-invalid_const_promotion-Accept-SIGTRAP-as-a-val.patch b/user/rust/0014-test-invalid_const_promotion-Accept-SIGTRAP-as-a-val.patch new file mode 100644 index 000000000..e892735a2 --- /dev/null +++ b/user/rust/0014-test-invalid_const_promotion-Accept-SIGTRAP-as-a-val.patch @@ -0,0 +1,25 @@ +From 52f262296db19bcb35410a05786e58a239216ba8 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Sun, 16 Sep 2018 16:37:09 +0000 +Subject: [PATCH 14/23] test/invalid_const_promotion: Accept SIGTRAP as a valid + death signal + +--- + src/test/run-pass/invalid_const_promotion.rs | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/test/run-pass/invalid_const_promotion.rs b/src/test/run-pass/invalid_const_promotion.rs +index ed8c499241..0f354e1aad 100644 +--- a/src/test/run-pass/invalid_const_promotion.rs ++++ b/src/test/run-pass/invalid_const_promotion.rs +@@ -39,6 +39,7 @@ fn check_status(status: std::process::ExitStatus) + use std::os::unix::process::ExitStatusExt; + + assert!(status.signal() == Some(libc::SIGILL) ++ || status.signal() == Some(libc::SIGTRAP) + || status.signal() == Some(libc::SIGABRT)); + } + +-- +2.19.2 + |