auto merge of #7923 : alexcrichton/rust/add-tests, r=graydon

Closes #5275, #4547

2 files changed, 48 insertions, 0 deletions

diff --git a/src/test/run-fail/tls-exit-status.rs b/src/test/run-fail/tls-exit-status.rs
new file mode 100644
index 00000000000..1858ceb2836
--- /dev/null
+++ b/src/test/run-fail/tls-exit-status.rs
@@ -0,0 +1,19 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// error-pattern:nonzero
+// exec-env:RUST_NEWRT=1
+
+use std::os;
+
+fn main() {
+    os::args();
+    fail!("please have a nonzero exit status");
+}
diff --git a/src/test/run-pass/issue-5275.rs b/src/test/run-pass/issue-5275.rs
new file mode 100644
index 00000000000..8f0d01fab40
--- /dev/null
+++ b/src/test/run-pass/issue-5275.rs
@@ -0,0 +1,29 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// Regression test for issue #5275
+
+fn foo(self_: &A) -> int {
+    if true {
+        fail!()
+    } else {
+        *bar(self_.bar)
+    }
+}
+
+fn bar<'r>(_: &'r mut int) -> &'r int {
+    fail!()
+}
+
+struct A {
+    bar: @mut int,
+}
+
+pub fn main() {}