diff options
| author | Or Brostovski <[email protected]> | 2010-08-07 16:43:08 +0300 |
|---|---|---|
| committer | Or Brostovski <[email protected]> | 2010-08-07 16:43:08 +0300 |
| commit | 4467d7683dae87d6d4c55e446910f7a5b85abd13 (patch) | |
| tree | e2578dbe8e2350eb4e82ae2941fc2efb7478253b /src/Makefile | |
| parent | Added AST pretty printing for communication alt statement, closes issue 19. (diff) | |
| parent | Add Or to the AUTHORS file. (diff) | |
| download | rust-4467d7683dae87d6d4c55e446910f7a5b85abd13.tar.xz rust-4467d7683dae87d6d4c55e446910f7a5b85abd13.zip | |
Merge branch 'master' of git://github.com/graydon/rust
Conflicts:
src/boot/fe/ast.ml
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index 7236e02f..1d79a467 100644 --- a/src/Makefile +++ b/src/Makefile @@ -389,11 +389,13 @@ TEST_XFAILS_X86 := $(TASK_XFAILS) \ test/run-pass/child-outlives-parent.rs \ test/run-pass/clone-with-exterior.rs \ test/run-pass/constrained-type.rs \ + test/run-pass/destructor-ordering.rs \ test/run-pass/obj-as.rs \ test/run-pass/vec-slice.rs \ test/run-pass/fn-lval.rs \ test/run-pass/generic-fn-infer.rs \ test/run-pass/generic-recursive-tag.rs \ + test/run-pass/int-lib.rs \ test/run-pass/iter-ret.rs \ test/run-pass/lib-deque.rs \ test/run-pass/lib-map.rs \ @@ -418,7 +420,6 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \ alt-tag.rs \ arithmetic-interference.rs \ argv.rs \ - auto-deref.rs \ autoderef-full-lval.rs \ autoderef-objfn.rs \ basic.rs \ @@ -452,7 +453,6 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \ generic-drop-glue.rs \ generic-exterior-box.rs \ generic-fn-infer.rs \ - generic-fn-twice.rs \ generic-fn.rs \ generic-obj-with-derived-type.rs \ generic-obj.rs \ @@ -464,6 +464,8 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \ i8-incr.rs \ import.rs \ inner-module.rs \ + integral-indexing.rs \ + int-lib.rs \ iter-range.rs \ iter-ret.rs \ large-records.rs \ @@ -481,8 +483,6 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \ mutable-alias-vec.rs \ mutable-vec-drop.rs \ mutual-recursion-group.rs \ - native-mod.rc \ - native.rc \ obj-as.rs \ obj-drop.rs \ obj-dtor.rs \ @@ -506,6 +506,7 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \ str-append.rs \ str-concat.rs \ str-idx.rs \ + str-lib.rs \ tag.rs \ tail-cps.rs \ tail-direct.rs \ |