Skip to content

this fixes the test failures on freebsd #26893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 8, 2015
Merged

this fixes the test failures on freebsd #26893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/compiletest/runtest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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