Skip to content

Commit

Permalink
this fixes the test failures on freebsd
Browse files Browse the repository at this point in the history
  • Loading branch information
Dave Huseby committed Jul 8, 2015
1 parent 50df2a0 commit b77985f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/compiletest/runtest.rs
Expand Up @@ -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"
}
Expand Down
6 changes: 6 additions & 0 deletions 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

0 comments on commit b77985f

Please sign in to comment.