diff options
| author | Dave Huseby <dhuseby@mozilla.com> | 2015-07-08 10:31:27 -0700 |
|---|---|---|
| committer | Dave Huseby <dhuseby@mozilla.com> | 2015-07-08 10:32:43 -0700 |
| commit | b77985fcfb9f0af810f387f79477234b1e110ef9 (patch) | |
| tree | 731efae223b0fc25acf97fd1f70d18793d8a8c42 | |
| parent | 50df2a09b8b9dd4883eb27d833a8482799175a3b (diff) | |
| download | rust-b77985fcfb9f0af810f387f79477234b1e110ef9.tar.gz rust-b77985fcfb9f0af810f387f79477234b1e110ef9.zip | |
this fixes the test failures on freebsd
| -rw-r--r-- | src/compiletest/runtest.rs | 5 | ||||
| -rw-r--r-- | src/test/run-make/execution-engine/Makefile | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index 39d99af8d6a..93054f39790 100644 --- a/src/compiletest/runtest.rs +++ b/src/compiletest/runtest.rs @@ -1702,8 +1702,11 @@ fn run_codegen_test(config: &Config, props: &TestProps, testfile: &Path) { } fn charset() -> &'static str { - if cfg!(any(target_os = "bitrig", target_os = "freebsd")) { + // FreeBSD 10.1 defaults to GDB 6.1.1 which doesn't support "auto" charset + if cfg!(target_os = "bitrig") { "auto" + } else if cfg!(target_os = "freebsd") { + "ISO-8859-1" } else { "UTF-8" } diff --git a/src/test/run-make/execution-engine/Makefile b/src/test/run-make/execution-engine/Makefile index 387905f45d8..ef646c5bf5d 100644 --- a/src/test/run-make/execution-engine/Makefile +++ b/src/test/run-make/execution-engine/Makefile @@ -1,8 +1,14 @@ -include ../tools.mk +# FIXME: ignore freebsd # This is a basic test of LLVM ExecutionEngine functionality using compiled # Rust code built using the `rustc` crate. +ifneq ($(shell uname),FreeBSD) all: $(RUSTC) test.rs $(call RUN,test $(RUSTC)) +else +all: + +endif |