---

yaml
---
r: 272761
b: refs/heads/beta
c: ad3ed80
h: refs/heads/master
i:
  272759: 417b6d1

Author: nikomatsakis

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 0d6b4e03862065d0b1296e93c9bdfed25e0f60a4
+refs/heads/beta: ad3ed805030a128d83349cbf3c2dfab15c8a61a7
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/COMPILER_TESTS.md

@@ -42,7 +42,7 @@ whole, instead of just a few lines inside the test.
 * `ignore-test` always ignores the test
 * `ignore-lldb` and `ignore-gdb` will skip the debuginfo tests
 * `min-{gdb,lldb}-version`
-* `should-panic` indicates that the test should fail; used for "meta testing",
+* `should-fail` indicates that the test should fail; used for "meta testing",
   where we test the compiletest program itself to check that it will generate
   errors in appropriate scenarios
 

branches/beta/src/compiletest/compiletest.rs

@@ -359,7 +359,7 @@ pub fn make_test(config: &Config, testpaths: &TestPaths) -> test::TestDescAndFn
         desc: test::TestDesc {
             name: make_test_name(config, testpaths),
             ignore: early_props.ignore,
-            should_panic: if early_props.should_panic {
+            should_panic: if early_props.should_fail {
                 test::ShouldPanic::Yes
             } else {
                 test::ShouldPanic::No

branches/beta/src/compiletest/header.rs

@@ -179,7 +179,7 @@ pub fn load_props_into(props: &mut TestProps, testfile: &Path, cfg: Option<&str>
 
 pub struct EarlyProps {
     pub ignore: bool,
-    pub should_panic: bool,
+    pub should_fail: bool,
 }
 
 // scan the file to detect whether the test should be ignored and
@@ -188,7 +188,7 @@ pub struct EarlyProps {
 pub fn early_props(config: &Config, testfile: &Path) -> EarlyProps {
     let mut props = EarlyProps {
         ignore: false,
-        should_panic: false,
+        should_fail: false,
     };
 
     iter_header(testfile, None, &mut |ln| {
@@ -206,9 +206,9 @@ pub fn early_props(config: &Config, testfile: &Path) -> EarlyProps {
             ignore_gdb(config, ln) ||
             ignore_lldb(config, ln);
 
-        props.should_panic =
-            props.should_panic ||
-            parse_name_directive(ln, "should-panic");
+        props.should_fail =
+            props.should_fail ||
+            parse_name_directive(ln, "should-fail");
     });
 
     return props;

branches/beta/src/test/compile-fail/meta-expected-error-wrong-rev.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // revisions: a
-// should-panic
+// should-fail
 // pretty-expanded FIXME #23616
 
 // This is a "meta-test" of the compilertest framework itself.  In