Skip to content

Commit 431008f

Browse files
committed
---
yaml --- r: 153937 b: refs/heads/try2 c: 284ffc5 h: refs/heads/master i: 153935: a03d0f4 v: v3
1 parent 5aaa267 commit 431008f

File tree

8 files changed

+14
-1
lines changed

8 files changed

+14
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: e99fc20f9595590597e09795de5bfa3d361517a9
8+
refs/heads/try2: 284ffc5b8206d8b32262014a0e7bbf1fa8d245a9
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/compiletest/runtest.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -834,6 +834,7 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
834834
#[cfg(target_os = "linux")]
835835
#[cfg(target_os = "macos")]
836836
#[cfg(target_os = "freebsd")]
837+
#[cfg(target_os = "dragonfly")]
837838
fn prefix_matches( line : &str, prefix : &str ) -> bool {
838839
line.starts_with( prefix )
839840
}
@@ -1237,6 +1238,7 @@ fn program_output(config: &Config, testfile: &Path, lib_path: &str, prog: String
12371238
#[cfg(target_os = "linux")]
12381239
#[cfg(target_os = "macos")]
12391240
#[cfg(target_os = "freebsd")]
1241+
#[cfg(target_os = "dragonfly")]
12401242
fn make_cmdline(_libpath: &str, prog: &str, args: &[String]) -> String {
12411243
format!("{} {}", prog, args.connect(" "))
12421244
}

branches/try2/src/compiletest/util.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ static OS_TABLE: &'static [(&'static str, &'static str)] = &[
2121
("android", "android"),
2222
("linux", "linux"),
2323
("freebsd", "freebsd"),
24+
("dragonfly", "dragonfly"),
2425
];
2526

2627
pub fn get_os(triple: &str) -> &'static str {

branches/try2/src/test/run-pass/dupe-first-attr.rc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ mod hello;
2323
#[cfg(target_os = "freebsd")]
2424
mod hello;
2525

26+
#[cfg(target_os = "dragonfly")]
27+
mod hello;
28+
2629
#[cfg(target_os = "android")]
2730
mod hello;
2831

branches/try2/src/test/run-pass/intrinsic-alignment.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ mod rusti {
2020
#[cfg(target_os = "linux")]
2121
#[cfg(target_os = "macos")]
2222
#[cfg(target_os = "freebsd")]
23+
#[cfg(target_os = "dragonfly")]
2324
mod m {
2425
#[main]
2526
#[cfg(target_arch = "x86")]

branches/try2/src/test/run-pass/lang-item-public.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ extern {}
2828
#[link(name = "execinfo")]
2929
extern {}
3030

31+
#[cfg(target_os = "dragonfly")]
32+
#[link(name = "c")]
33+
extern {}
34+
3135
#[cfg(target_os = "macos")]
3236
#[link(name = "System")]
3337
extern {}

branches/try2/src/test/run-pass/rec-align-u64.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ struct Outer {
3939
#[cfg(target_os = "linux")]
4040
#[cfg(target_os = "macos")]
4141
#[cfg(target_os = "freebsd")]
42+
#[cfg(target_os = "dragonfly")]
4243
mod m {
4344
#[cfg(target_arch = "x86")]
4445
pub mod m {

branches/try2/src/test/run-pass/x86stdcall.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@ pub fn main() {
3333
#[cfg(target_os = "macos")]
3434
#[cfg(target_os = "linux")]
3535
#[cfg(target_os = "freebsd")]
36+
#[cfg(target_os = "dragonfly")]
3637
#[cfg(target_os = "android")]
3738
pub fn main() { }

0 commit comments

Comments
 (0)