diff options
| author | Graydon Hoare <[email protected]> | 2010-07-02 16:27:39 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2010-07-02 16:27:39 -0700 |
| commit | 8660ce50a134a74bc841f32e50eb1eab83f8b45b (patch) | |
| tree | aeb7795b09c1d2507198cfa8642ef797d685bc8f /src/Makefile | |
| parent | Fix bug in clone logic; was ignoring the mutability-strip step in later rule. (diff) | |
| parent | Fix two bugs in tag patterns: 1. Look up the tag constructor function item us... (diff) | |
| download | rust-8660ce50a134a74bc841f32e50eb1eab83f8b45b.tar.xz rust-8660ce50a134a74bc841f32e50eb1eab83f8b45b.zip | |
Merge branch 'master' of [email protected]:graydon/rust into exterior_and_mutable_types
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index bf11e98d..fa02a2a2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -325,7 +325,7 @@ TEST_XFAILS_X86 := test/run-pass/mlist-cycle.rs \ test/run-pass/vec-slice.rs \ test/run-pass/fn-lval.rs \ test/run-pass/generic-fn-infer.rs \ - test/run-pass/generic-obj.rs \ + test/run-pass/generic-fn-twice.rs \ test/run-pass/generic-recursive-tag.rs \ test/run-pass/mutable-alias-vec.rs \ test/run-pass/mutable-vec-drop.rs \ @@ -372,6 +372,7 @@ TEST_XFAILS_LLVM := $(addprefix test/run-pass/, \ 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 \ |