dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pretty-print test the rfail tests. Issue #789

This commit is contained in:
Brian Anderson 2011-08-01 11:57:05 -07:00
parent 0a6e3362c6
commit e13390a199
3 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mk/tests.mk
View File

@ -150,6 +150,10 @@ check-stage$(2)-bench: test/bench.stage$(2).out \
check-stage$(2)-pretty: test/pretty.stage$(2).out \
check-stage$(2)-pretty-rpass: test/pretty-rpass.stage$(2).out \
check-stage$(2)-pretty-rfail: test/pretty-rfail.stage$(2).out \
CTEST_COMMON_ARGS$(2) := --compile-lib-path stage$(2) \
--run-lib-path stage$(2)/lib \
--rustc-path stage$(2)/rustc$$(X) \
@ -180,11 +184,16 @@ BENCH_ARGS$(2) := $$(CTEST_COMMON_ARGS$(2)) \
--mode run-pass \
$$(CTEST_RUNTOOL) \
PRETTY_ARGS$(2) := $$(CTEST_COMMON_ARGS$(2)) \
PRETTY_RPASS_ARGS$(2) := $$(CTEST_COMMON_ARGS$(2)) \
--src-base $$(S)src/test/run-pass/ \
--build-base test/run-pass/ \
--mode pretty \
PRETTY_RFAIL_ARGS$(2) := $$(CTEST_COMMON_ARGS$(2)) \
--src-base $$(S)src/test/run-fail/ \
--build-base test/run-fail/ \
--mode pretty \
test/compiletest.stage$(2)$$(X): $$(COMPILETEST_CRATE) \
$$(COMPILETEST_INPUTS) \
$$(SREQ$(2))
@ -215,10 +224,20 @@ test/bench.stage$(2).out.tmp: test/compiletest.stage$(2)$$(X) \
$$(Q)$$(call CFG_RUN_CTEST,$(2),$$<) $$(BENCH_ARGS$(2))
$$(Q)touch $$@
test/pretty.stage$(2).out.tmp: test/compiletest.stage$(2)$$(X) \
test/pretty-rpass.stage$(2).out.tmp: test/compiletest.stage$(2)$$(X) \
$$(RPASS_TESTS)
@$$(call E, run: $$<)
$$(Q)$$(call CFG_RUN_CTEST,$(2),$$<) $$(PRETTY_ARGS$(2))
$$(Q)$$(call CFG_RUN_CTEST,$(2),$$<) $$(PRETTY_RPASS_ARGS$(2))
$$(Q)touch $$@
test/pretty-rfail.stage$(2).out.tmp: test/compiletest.stage$(2)$$(X) \
$$(RFAIL_TESTS)
@$$(call E, run: $$<)
$$(Q)$$(call CFG_RUN_CTEST,$(2),$$<) $$(PRETTY_RFAIL_ARGS$(2))
$$(Q)touch $$@
test/pretty.stage$(2).out.tmp: test/pretty-rpass.stage$(2).out.tmp \
test/pretty-rfail.stage$(2).out.tmp
$$(Q)touch $$@
endef

1
src/test/run-fail/fmt-fail.rs
View File

@ -1,4 +1,5 @@
// xfail-stage0
// xfail-pretty
// error-pattern:meh
use std;
import std::str;

1
src/test/run-fail/fn-constraint-claim.rs
View File

@ -1,5 +1,6 @@
// xfail-stage0
// xfail-stage1
// xfail-pretty
// error-pattern:quux
use std;
import std::str::*;