aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorPatrick Walton <[email protected]>2010-11-22 17:38:23 -0800
committerPatrick Walton <[email protected]>2010-11-22 17:38:23 -0800
commit3e01b2d529a81ac7b2d7ba3deb5d1f116efc7b34 (patch)
tree25eb2b69c00a4fd73a99e36a8db8ffb0ced2388c /src/Makefile
parentRemove the global bindings table in the typechecker (diff)
downloadrust-3e01b2d529a81ac7b2d7ba3deb5d1f116efc7b34.tar.xz
rust-3e01b2d529a81ac7b2d7ba3deb5d1f116efc7b34.zip
rustc: "Expected" and "actual" were swapped. Also un-XFAIL compile-fail/arg-count-mismatch.rs for good measure.
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile
index 74f0dbd1..db21cab1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -536,6 +536,9 @@ TEST_XFAILS_SELF := $(filter-out \
uint.rs \
unit.rs \
while-and-do-while.rs \
+ ) \
+ $(addprefix test/compile-fail/, \
+ arg-count-mismatch.rs \
), \
$(wildcard test/*/*.rs test/*/*.rc))
@@ -772,6 +775,13 @@ test/compile-fail/%-boot.llvm.out.tmp: test/compile-fail/%.rs $(BREQ)
$(CFG_QUIET)grep --text --quiet \
"`awk -F: '/error-pattern/ { print $$2 }' $< | tr -d '\n\r'`" $@
+test/compile-fail/%.llvm.out.tmp: test/compile-fail/%.rs $(BREQ)
+ @$(call CFG_ECHO, compile [rustc]: $<)
+ $(CFG_QUIET)rm -f $@
+ $(BOOT) -o $(@:.out=$(CFG_EXE_SUFFIX)) $< >$@ 2>&1 || true
+ $(CFG_QUIET)grep --text --quiet \
+ "`awk -F: '/error-pattern/ { print $$2 }' $< | tr -d '\n\r'`" $@
+
test/run-pass/%-boot.x86$(CFG_EXE_SUFFIX): test/run-pass/%.rc $(BREQ)
@$(call CFG_ECHO, compile [boot x86]: $<)
$(BOOT) -o $@ $<