diff options
| author | Tohava <tohava@tohava-laptop.(none)> | 2010-08-05 04:19:46 +0300 |
|---|---|---|
| committer | Tohava <tohava@tohava-laptop.(none)> | 2010-08-05 04:19:46 +0300 |
| commit | ce79b0e492f1583debbce3c8155da3536c684d9a (patch) | |
| tree | f5a2a22230510dd14901742a4904c576f62a8500 /src/Makefile | |
| parent | Added AST logging, and modified AST for consistent handling of alt stmts. (diff) | |
| parent | Thread argument-types down to internal_check_outer_lval in type.ml, in prepar... (diff) | |
| download | rust-ce79b0e492f1583debbce3c8155da3536c684d9a.tar.xz rust-ce79b0e492f1583debbce3c8155da3536c684d9a.zip | |
Merge branch 'master' of git://github.com/graydon/rust
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile index afea1af3..7236e02f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -489,6 +489,7 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \ obj-recursion.rs \ obj-return-polytypes.rs \ obj-with-vec.rs \ + operator-associativity.rs \ output-slot-variants.rs \ pred.rs \ preempt.rs \ @@ -576,10 +577,18 @@ RFAIL_RS := $(wildcard test/run-fail/*.rs) CFAIL_RC := $(wildcard test/compile-fail/*.rc) CFAIL_RS := $(wildcard test/compile-fail/*.rs) +ifdef CHECK_XFAILS +TEST_RPASS_CRATES_X86 := $(filter $(TEST_XFAILS_X86), $(RPASS_RC)) +TEST_RPASS_CRATES_LLVM := $(filter $(TEST_XFAILS_LLVM), $(RPASS_RC)) +TEST_RPASS_SOURCES_X86 := $(filter $(TEST_XFAILS_X86), $(RPASS_RS)) +TEST_RPASS_SOURCES_LLVM := $(filter $(TEST_XFAILS_LLVM), $(RPASS_RS)) +else TEST_RPASS_CRATES_X86 := $(filter-out $(TEST_XFAILS_X86), $(RPASS_RC)) TEST_RPASS_CRATES_LLVM := $(filter-out $(TEST_XFAILS_LLVM), $(RPASS_RC)) TEST_RPASS_SOURCES_X86 := $(filter-out $(TEST_XFAILS_X86), $(RPASS_RS)) TEST_RPASS_SOURCES_LLVM := $(filter-out $(TEST_XFAILS_LLVM), $(RPASS_RS)) +endif + TEST_RPASS_EXTRAS := $(wildcard test/run-pass/*/*.rs) TEST_RPASS_EXES_X86 := \ $(TEST_RPASS_CRATES_X86:.rc=.x86$(CFG_EXE_SUFFIX)) \ |