about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorVadim Chugunov <vadimcn@gmail.com>2016-12-05 16:31:05 -0800
committerVadim Chugunov <vadimcn@gmail.com>2016-12-05 16:40:43 -0800
commitb700dd35e7fe9f3a987cca47a00ac0bdd1cfd425 (patch)
treee6f30dde617f98a241a9701e9e7a65d9fc673314 /src
parent2e03549e67a48b6a2b3a83d26dd3540c294b9d6a (diff)
Annotate more tests with kind="static"
Diffstat (limited to 'src')
-rw-r--r--src/test/run-make/c-static-dylib/foo.rs2
-rw-r--r--src/test/run-make/c-static-rlib/foo.rs2
-rw-r--r--src/test/run-make/extern-fn-generic/test.rs2
-rw-r--r--src/test/run-make/extern-fn-generic/testcrate.rs2
-rw-r--r--src/test/run-make/interdependent-c-libraries/bar.rs2
-rw-r--r--src/test/run-make/interdependent-c-libraries/foo.rs2
-rw-r--r--src/test/run-make/issue-25581/test.rs2
-rw-r--r--src/test/run-make/link-path-order/main.rs2
8 files changed, 8 insertions, 8 deletions
diff --git a/src/test/run-make/c-static-dylib/foo.rs b/src/test/run-make/c-static-dylib/foo.rs
index 04253be71d4..44be5ac890d 100644
--- a/src/test/run-make/c-static-dylib/foo.rs
+++ b/src/test/run-make/c-static-dylib/foo.rs
@@ -10,7 +10,7 @@
 
 #![crate_type = "dylib"]
 
-#[link(name = "cfoo")]
+#[link(name = "cfoo", kind = "static")]
 extern {
     fn foo();
 }
diff --git a/src/test/run-make/c-static-rlib/foo.rs b/src/test/run-make/c-static-rlib/foo.rs
index a1f01bd2b62..cbd7b020bd8 100644
--- a/src/test/run-make/c-static-rlib/foo.rs
+++ b/src/test/run-make/c-static-rlib/foo.rs
@@ -10,7 +10,7 @@
 
 #![crate_type = "rlib"]
 
-#[link(name = "cfoo")]
+#[link(name = "cfoo", kind = "static")]
 extern {
     fn foo();
 }
diff --git a/src/test/run-make/extern-fn-generic/test.rs b/src/test/run-make/extern-fn-generic/test.rs
index ee0485683ec..8f5ff091b3b 100644
--- a/src/test/run-make/extern-fn-generic/test.rs
+++ b/src/test/run-make/extern-fn-generic/test.rs
@@ -12,7 +12,7 @@ extern crate testcrate;
 
 extern "C" fn bar<T>(ts: testcrate::TestStruct<T>) -> T { ts.y }
 
-#[link(name = "test")]
+#[link(name = "test", kind = "static")]
 extern {
     fn call(c: extern "C" fn(testcrate::TestStruct<i32>) -> i32) -> i32;
 }
diff --git a/src/test/run-make/extern-fn-generic/testcrate.rs b/src/test/run-make/extern-fn-generic/testcrate.rs
index 5fd61bb419c..d02c05047c0 100644
--- a/src/test/run-make/extern-fn-generic/testcrate.rs
+++ b/src/test/run-make/extern-fn-generic/testcrate.rs
@@ -18,7 +18,7 @@ pub struct TestStruct<T> {
 
 pub extern "C" fn foo<T>(ts: TestStruct<T>) -> T { ts.y }
 
-#[link(name = "test")]
+#[link(name = "test", kind = "static")]
 extern {
     pub fn call(c: extern "C" fn(TestStruct<i32>) -> i32) -> i32;
 }
diff --git a/src/test/run-make/interdependent-c-libraries/bar.rs b/src/test/run-make/interdependent-c-libraries/bar.rs
index 88fc98615f0..1963976b4b0 100644
--- a/src/test/run-make/interdependent-c-libraries/bar.rs
+++ b/src/test/run-make/interdependent-c-libraries/bar.rs
@@ -12,7 +12,7 @@
 
 extern crate foo;
 
-#[link(name = "bar")]
+#[link(name = "bar", kind = "static")]
 extern {
     fn bar();
 }
diff --git a/src/test/run-make/interdependent-c-libraries/foo.rs b/src/test/run-make/interdependent-c-libraries/foo.rs
index f94c6edb97d..7a0fe6bb18f 100644
--- a/src/test/run-make/interdependent-c-libraries/foo.rs
+++ b/src/test/run-make/interdependent-c-libraries/foo.rs
@@ -10,7 +10,7 @@
 
 #![crate_type = "rlib"]
 
-#[link(name = "foo")]
+#[link(name = "foo", kind = "static")]
 extern {
     fn foo();
 }
diff --git a/src/test/run-make/issue-25581/test.rs b/src/test/run-make/issue-25581/test.rs
index e2e86df59cd..6717d16cb7c 100644
--- a/src/test/run-make/issue-25581/test.rs
+++ b/src/test/run-make/issue-25581/test.rs
@@ -12,7 +12,7 @@
 
 extern crate libc;
 
-#[link(name = "test")]
+#[link(name = "test", kind = "static")]
 extern {
     fn slice_len(s: &[u8]) -> libc::size_t;
     fn slice_elem(s: &[u8], idx: libc::size_t) -> u8;
diff --git a/src/test/run-make/link-path-order/main.rs b/src/test/run-make/link-path-order/main.rs
index 450460cf192..aaac3927f1c 100644
--- a/src/test/run-make/link-path-order/main.rs
+++ b/src/test/run-make/link-path-order/main.rs
@@ -12,7 +12,7 @@
 
 extern crate libc;
 
-#[link(name="foo")]
+#[link(name="foo", kind = "static")]
 extern {
     fn should_return_one() -> libc::c_int;
 }