From 42f5ac568aab2d93ef682d05606fa54c1e3b618f Mon Sep 17 00:00:00 2001 From: Will Date: Sun, 15 Feb 2015 17:18:55 +0900 Subject: [PATCH] Fix tests that fail on FreeBSD --- src/test/debuginfo/gdb-pretty-struct-and-enums-pre-gdb-7-7.rs | 1 + src/test/debuginfo/gdb-pretty-struct-and-enums.rs | 1 + 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 092cd9edc7065..aa902a9b2d4ad 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 4b2628b2a1f73..d9a7e7406eb73 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 bdce7b7810aaf..f8abc5019b4fd 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