aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorBrian Anderson <[email protected]>2011-01-31 20:27:38 -0500
committerBrian Anderson <[email protected]>2011-01-31 20:27:38 -0500
commitc848ed1e9862a527e0a6f16ef235b41f98baa419 (patch)
tree3ad344301bdcff06081a1a38d7cb709c08d66668 /src/Makefile
parentTeach rustc to parse 'else if' (diff)
parentMajority of the remaining work for derived tydescs. Not quite working yet. (diff)
downloadrust-c848ed1e9862a527e0a6f16ef235b41f98baa419.tar.xz
rust-c848ed1e9862a527e0a6f16ef235b41f98baa419.zip
Merge branch 'master' into forgraydon-elseif
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile
index bd45d253..ac7dfcbb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -510,10 +510,13 @@ TEST_XFAILS_RUSTC := $(filter-out \
writealias.rs \
) \
$(addprefix test/compile-fail/, \
+ alt-tag-nullary.rs \
+ alt-tag-unary.rs \
arg-count-mismatch.rs \
arg-type-mismatch.rs \
bad-expr-path.rs \
bad-expr-path2.rs \
+ bogus-tag.rs \
import.rs \
import2.rs \
import3.rs \
@@ -521,7 +524,11 @@ TEST_XFAILS_RUSTC := $(filter-out \
import-loop.rs \
import-loop-2.rs \
multiline-comment-line-tracking.rs \
+ output-type-mismatch.rs \
+ rec-missing-fields.rs \
+ type-shadow.rs \
while-type-error.rs \
+ wrong-ret-type.rs \
), \
$(wildcard test/*/*.rs test/*/*.rc))