---

yaml
---
r: 274018
b: refs/heads/beta
c: 0985717
h: refs/heads/master

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: a5236e9da03fe58c4db8f011880c74a6911ed5e7
+refs/heads/beta: 098571797ca093f98f1e92634568aee38e8964cc
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/mk/tests.mk

@@ -954,7 +954,7 @@ TEST_GROUPS = \
 	debuginfo-lldb \
 	codegen \
 	codegen-units \
-    incremental \
+	incremental \
 	doc \
 	$(foreach docname,$(DOC_NAMES),doc-$(docname)) \
 	pretty \

branches/beta/src/compiletest/runtest.rs

@@ -1972,9 +1972,10 @@ fn run_codegen_units_test(config: &Config, props: &TestProps, testpaths: &TestPa
 fn run_incremental_test(config: &Config, props: &TestProps, testpaths: &TestPaths) {
     // Basic plan for a test incremental/foo/bar.rs:
     // - load list of revisions pass1, fail2, pass3
-    //   - each should begin with `pass` or `fail`
-    //   - if `pass`, expect compile to succeed
-    //   - if `fail`, expect errors from file
+    //   - each should begin with `rpass`, `rfail`, or `cfail`
+    //   - if `rpass`, expect compile and execution to succeed
+    //   - if `cfail`, expect compilation to fail
+    //   - if `rfail`, expect execution to fail
     // - create a directory build/foo/bar.incremental
     // - compile foo/bar.rs with -Z incremental=.../foo/bar.incremental and -C pass1
     //   - because name of revision starts with "pass", expect success