Skip to content

Commit

Permalink
Fix test suite for DragonFly
Browse files Browse the repository at this point in the history
  • Loading branch information
mneumann committed Jul 31, 2014
1 parent e99fc20 commit 284ffc5
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/compiletest/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,7 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
#[cfg(target_os = "linux")]
#[cfg(target_os = "macos")]
#[cfg(target_os = "freebsd")]
#[cfg(target_os = "dragonfly")]
fn prefix_matches( line : &str, prefix : &str ) -> bool {
line.starts_with( prefix )
}
Expand Down Expand Up @@ -1237,6 +1238,7 @@ fn program_output(config: &Config, testfile: &Path, lib_path: &str, prog: String
#[cfg(target_os = "linux")]
#[cfg(target_os = "macos")]
#[cfg(target_os = "freebsd")]
#[cfg(target_os = "dragonfly")]
fn make_cmdline(_libpath: &str, prog: &str, args: &[String]) -> String {
format!("{} {}", prog, args.connect(" "))
}
Expand Down
1 change: 1 addition & 0 deletions src/compiletest/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ static OS_TABLE: &'static [(&'static str, &'static str)] = &[
("android", "android"),
("linux", "linux"),
("freebsd", "freebsd"),
("dragonfly", "dragonfly"),
];

pub fn get_os(triple: &str) -> &'static str {
Expand Down
3 changes: 3 additions & 0 deletions src/test/run-pass/dupe-first-attr.rc
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ mod hello;
#[cfg(target_os = "freebsd")]
mod hello;

#[cfg(target_os = "dragonfly")]
mod hello;

#[cfg(target_os = "android")]
mod hello;

Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/intrinsic-alignment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ mod rusti {
#[cfg(target_os = "linux")]
#[cfg(target_os = "macos")]
#[cfg(target_os = "freebsd")]
#[cfg(target_os = "dragonfly")]
mod m {
#[main]
#[cfg(target_arch = "x86")]
Expand Down
4 changes: 4 additions & 0 deletions src/test/run-pass/lang-item-public.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ extern {}
#[link(name = "execinfo")]
extern {}

#[cfg(target_os = "dragonfly")]
#[link(name = "c")]
extern {}

#[cfg(target_os = "macos")]
#[link(name = "System")]
extern {}
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/rec-align-u64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ struct Outer {
#[cfg(target_os = "linux")]
#[cfg(target_os = "macos")]
#[cfg(target_os = "freebsd")]
#[cfg(target_os = "dragonfly")]
mod m {
#[cfg(target_arch = "x86")]
pub mod m {
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/x86stdcall.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ pub fn main() {
#[cfg(target_os = "macos")]
#[cfg(target_os = "linux")]
#[cfg(target_os = "freebsd")]
#[cfg(target_os = "dragonfly")]
#[cfg(target_os = "android")]
pub fn main() { }

5 comments on commit 284ffc5

@bors
Copy link
Contributor

@bors bors commented on 284ffc5 Jul 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 284ffc5 Jul 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging mneumann/rust/dragonfly2 = 284ffc5 into auto

@bors
Copy link
Contributor

@bors bors commented on 284ffc5 Jul 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mneumann/rust/dragonfly2 = 284ffc5 merged ok, testing candidate = 9826e80

@bors
Copy link
Contributor

@bors bors commented on 284ffc5 Jul 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 9826e80

Please sign in to comment.