about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-02-20 02:52:01 +0000
committerbors <bors@rust-lang.org>2016-02-20 02:52:01 +0000
commita212264011289885bdb8b2306a8fdd50e1f83c99 (patch)
tree6b2e9d0f5f6a26c4e37dcc929506d57d1d44c997
parent54f3f2e302d6e5460e14c7e21c2c1a54291e8a59 (diff)
parentd835f5bfd84104477d77cfc47e1f7a8c50ec384d (diff)
downloadrust-a212264011289885bdb8b2306a8fdd50e1f83c99.tar.gz
rust-a212264011289885bdb8b2306a8fdd50e1f83c99.zip
Auto merge of #31771 - alexcrichton:oops-that-didnt-fix-anything, r=brson
In #31717 we rebased our LLVM fork over the 3.8 release branch, and it was
thought that this fixed #31702. The testing, however, must have been erroneous,
as it unfortunately didn't fix the issue! Our MUSL nightly builders are failing
from the same assertion reported in the issue, so we at least know the test case
is a reproduction!

I believe the failure is only happening on the MUSL nightly builders because
none of the auto builders have LLVM assertions enabled, and the Linux nightly
builder *does* have assertions enabled for the binaries we generate but the
distcheck run doesn't test a compiler with LLVM assertions enabled.
-rw-r--r--src/test/run-pass/issue-31702.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/test/run-pass/issue-31702.rs b/src/test/run-pass/issue-31702.rs
index 89eafa88ee0..334c1b2a28b 100644
--- a/src/test/run-pass/issue-31702.rs
+++ b/src/test/run-pass/issue-31702.rs
@@ -10,6 +10,11 @@
 
 // aux-build:issue-31702-1.rs
 // aux-build:issue-31702-2.rs
+// ignore-test: FIXME(#31702) when this test was added it was thought that the
+//                            accompanying llvm update would fix it, but
+//                            unfortunately it appears that was not the case. In
+//                            the interest of not deleting the test, though,
+//                            this is just tagged with ignore-test
 
 // this test is actually entirely in the linked library crates