---

yaml
---
r: 276937
b: refs/heads/try
c: 0985717
h: refs/heads/master
i:
  276935: aba4cf2

Author: nikomatsakis

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: a5236e9da03fe58c4db8f011880c74a6911ed5e7
+refs/heads/try: 098571797ca093f98f1e92634568aee38e8964cc
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/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/try/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