diff options
| author | Michael Neumann <mneumann@ntecs.de> | 2014-07-31 02:23:35 +0200 |
|---|---|---|
| committer | Michael Neumann <mneumann@ntecs.de> | 2014-07-31 02:23:35 +0200 |
| commit | 284ffc5b8206d8b32262014a0e7bbf1fa8d245a9 (patch) | |
| tree | ff34db60f7c41bc47138f1b2699675b5a2cc8deb | |
| parent | e99fc20f9595590597e09795de5bfa3d361517a9 (diff) | |
| download | rust-284ffc5b8206d8b32262014a0e7bbf1fa8d245a9.tar.gz rust-284ffc5b8206d8b32262014a0e7bbf1fa8d245a9.zip | |
Fix test suite for DragonFly
| -rw-r--r-- | src/compiletest/runtest.rs | 2 | ||||
| -rw-r--r-- | src/compiletest/util.rs | 1 | ||||
| -rw-r--r-- | src/test/run-pass/dupe-first-attr.rc | 3 | ||||
| -rw-r--r-- | src/test/run-pass/intrinsic-alignment.rs | 1 | ||||
| -rw-r--r-- | src/test/run-pass/lang-item-public.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass/rec-align-u64.rs | 1 | ||||
| -rw-r--r-- | src/test/run-pass/x86stdcall.rs | 1 |
7 files changed, 13 insertions, 0 deletions
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index 6720b9a530f..353d8c931a6 100644 --- a/src/compiletest/runtest.rs +++ b/src/compiletest/runtest.rs @@ -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 ) } @@ -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(" ")) } diff --git a/src/compiletest/util.rs b/src/compiletest/util.rs index 369e6b0af64..445e814a1eb 100644 --- a/src/compiletest/util.rs +++ b/src/compiletest/util.rs @@ -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 { diff --git a/src/test/run-pass/dupe-first-attr.rc b/src/test/run-pass/dupe-first-attr.rc index c3c22cb26d2..76dedaba40f 100644 --- a/src/test/run-pass/dupe-first-attr.rc +++ b/src/test/run-pass/dupe-first-attr.rc @@ -23,6 +23,9 @@ mod hello; #[cfg(target_os = "freebsd")] mod hello; +#[cfg(target_os = "dragonfly")] +mod hello; + #[cfg(target_os = "android")] mod hello; diff --git a/src/test/run-pass/intrinsic-alignment.rs b/src/test/run-pass/intrinsic-alignment.rs index 84593ececd0..197b92ba635 100644 --- a/src/test/run-pass/intrinsic-alignment.rs +++ b/src/test/run-pass/intrinsic-alignment.rs @@ -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")] diff --git a/src/test/run-pass/lang-item-public.rs b/src/test/run-pass/lang-item-public.rs index 6330e1bf3c1..f541ca6794f 100644 --- a/src/test/run-pass/lang-item-public.rs +++ b/src/test/run-pass/lang-item-public.rs @@ -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 {} diff --git a/src/test/run-pass/rec-align-u64.rs b/src/test/run-pass/rec-align-u64.rs index cf254d54793..ada012fc2f5 100644 --- a/src/test/run-pass/rec-align-u64.rs +++ b/src/test/run-pass/rec-align-u64.rs @@ -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 { diff --git a/src/test/run-pass/x86stdcall.rs b/src/test/run-pass/x86stdcall.rs index b2cf771faee..66dbb6b1619 100644 --- a/src/test/run-pass/x86stdcall.rs +++ b/src/test/run-pass/x86stdcall.rs @@ -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() { } |
