Skip to content

Fix a number of failing tests on Solaris and SPARC #43634

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.

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 4 commits into from
Aug 4, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 1 addition & 6 deletions src/libstd/sys/unix/fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -284,12 +284,7 @@ impl DirEntry {
lstat(&self.path())
}

#[cfg(target_os = "solaris")]
pub fn file_type(&self) -> io::Result<FileType> {
stat(&self.path()).map(|m| m.file_type())
}

#[cfg(target_os = "haiku")]
#[cfg(any(target_os = "solaris", target_os = "haiku"))]
pub fn file_type(&self) -> io::Result<FileType> {
lstat(&self.path()).map(|m| m.file_type())
}
Expand Down
1 change: 1 addition & 0 deletions src/test/compile-fail/asm-bad-clobber.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// ignore-s390x
// ignore-emscripten
// ignore-powerpc
// ignore-sparc

#![feature(asm, rustc_attrs)]

Expand Down
1 change: 1 addition & 0 deletions src/test/compile-fail/asm-in-bad-modifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
// ignore-s390x
// ignore-emscripten
// ignore-powerpc
// ignore-sparc

#![feature(asm)]

Expand Down
1 change: 1 addition & 0 deletions src/test/compile-fail/asm-misplaced-option.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// ignore-s390x
// ignore-emscripten
// ignore-powerpc
// ignore-sparc

#![feature(asm, rustc_attrs)]

Expand Down
1 change: 1 addition & 0 deletions src/test/compile-fail/asm-out-assign-imm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
// ignore-s390x
// ignore-emscripten
// ignore-powerpc
// ignore-sparc

#![feature(asm)]

Expand Down
1 change: 1 addition & 0 deletions src/test/compile-fail/asm-out-no-modifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
// ignore-s390x
// ignore-emscripten
// ignore-powerpc
// ignore-sparc

#![feature(asm)]

Expand Down
1 change: 1 addition & 0 deletions src/test/compile-fail/asm-out-read-uninit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
// ignore-s390x
// ignore-emscripten
// ignore-powerpc
// ignore-sparc

#![feature(asm)]

Expand Down
4 changes: 2 additions & 2 deletions src/test/run-make/codegen-options-parsing/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ all:

# Should not link dead code...
$(RUSTC) -Z print-link-args dummy.rs 2>&1 | \
grep -e '--gc-sections' -e '-dead_strip' -e '/OPT:REF'
grep -e '--gc-sections' -e '-z[^ ]* [^ ]*\<ignore\>' -e '-dead_strip' -e '/OPT:REF'
# ... unless you specifically ask to keep it
$(RUSTC) -Z print-link-args -C link-dead-code dummy.rs 2>&1 | \
(! grep -e '--gc-sections' -e '-dead_strip' -e '/OPT:REF')
(! grep -e '--gc-sections' -e '-z[^ ]* [^ ]*\<ignore\>' -e '-dead_strip' -e '/OPT:REF')
2 changes: 1 addition & 1 deletion src/test/run-make/tools.mk
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ ifeq ($(UNAME),Bitrig)
EXTRACXXFLAGS := -lc++ -lc++abi
else
ifeq ($(UNAME),SunOS)
EXTRACFLAGS := -lm -lpthread -lposix4 -lsocket
EXTRACFLAGS := -lm -lpthread -lposix4 -lsocket -lresolv
else
ifeq ($(UNAME),OpenBSD)
EXTRACFLAGS := -lm -lpthread
Expand Down
3 changes: 3 additions & 0 deletions src/test/run-pass/conditional-compile-arch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,6 @@ pub fn main() { }

#[cfg(target_arch = "wasm32")]
pub fn main() { }

#[cfg(target_arch = "sparc64")]
pub fn main() { }
1 change: 1 addition & 0 deletions src/test/run-pass/union/union-basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

// FIXME: This test case makes little-endian assumptions.
// ignore-s390x
// ignore-sparc

extern crate union;
use std::mem::{size_of, align_of, zeroed};
Expand Down