diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-02-16 11:27:42 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-02-17 06:23:36 +0530 |
| commit | cdf0cb0a16a588c743cc09c383676c6a4c8db8f5 (patch) | |
| tree | 37f16f45ef5168f0c8df343eaa43e63f6cc03d23 /src/test | |
| parent | 1c8e592bb758a7c6a3b169065064b0b9ff482878 (diff) | |
| parent | 42f5ac568aab2d93ef682d05606fa54c1e3b618f (diff) | |
Rollup merge of #22360 - wg:master, r=alexcrichton
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/debuginfo/gdb-pretty-struct-and-enums-pre-gdb-7-7.rs | 1 | ||||
| -rw-r--r-- | src/test/debuginfo/gdb-pretty-struct-and-enums.rs | 1 | ||||
| -rw-r--r-- | src/test/run-make/use-extern-for-plugins/Makefile | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/test/debuginfo/gdb-pretty-struct-and-enums-pre-gdb-7-7.rs b/src/test/debuginfo/gdb-pretty-struct-and-enums-pre-gdb-7-7.rs index 092cd9edc70..aa902a9b2d4 100644 --- a/src/test/debuginfo/gdb-pretty-struct-and-enums-pre-gdb-7-7.rs +++ b/src/test/debuginfo/gdb-pretty-struct-and-enums-pre-gdb-7-7.rs @@ -13,6 +13,7 @@ // gdb-pretty-struct-and-enums.rs // ignore-windows failing on win32 bot +// ignore-freebsd: gdb package too new // ignore-tidy-linelength // ignore-lldb // ignore-android: FIXME(#10381) diff --git a/src/test/debuginfo/gdb-pretty-struct-and-enums.rs b/src/test/debuginfo/gdb-pretty-struct-and-enums.rs index 4b2628b2a1f..d9a7e7406eb 100644 --- a/src/test/debuginfo/gdb-pretty-struct-and-enums.rs +++ b/src/test/debuginfo/gdb-pretty-struct-and-enums.rs @@ -9,6 +9,7 @@ // except according to those terms. // ignore-windows failing on win32 bot +// ignore-freebsd: output doesn't match // ignore-tidy-linelength // ignore-lldb // ignore-android: FIXME(#10381) diff --git a/src/test/run-make/use-extern-for-plugins/Makefile b/src/test/run-make/use-extern-for-plugins/Makefile index bdce7b7810a..f8abc5019b4 100644 --- a/src/test/run-make/use-extern-for-plugins/Makefile +++ b/src/test/run-make/use-extern-for-plugins/Makefile @@ -1,6 +1,6 @@ -include ../tools.mk -ifneq ($(UNAME),OpenBSD) +ifneq ($(findstring BSD,$(UNAME)),BSD) HOST := $(shell $(RUSTC) -vV | grep 'host:' | sed 's/host: //') ifeq ($(findstring i686,$(HOST)),i686) TARGET := $(subst i686,x86_64,$(HOST)) @@ -13,6 +13,6 @@ all: $(RUSTC) bar.rs -C extra-filename=-targ --target $(TARGET) $(RUSTC) baz.rs --extern a=$(TMPDIR)/liba-targ.rlib --target $(TARGET) else -# OpenBSD support only x86_64 architecture for now +# FreeBSD & OpenBSD support only x86_64 architecture for now all: endif |