Change tests per RFC 246 (const vs static)

3 files changed, 7 insertions, 11 deletions

diff --git a/src/test/auxiliary/sepcomp_cci_lib.rs b/src/test/auxiliary/sepcomp_cci_lib.rs
index d62b9871402..c57d161d8f5 100644
--- a/src/test/auxiliary/sepcomp_cci_lib.rs
+++ b/src/test/auxiliary/sepcomp_cci_lib.rs
@@ -13,5 +13,4 @@ pub fn cci_fn() -> usize {
     1200
 }
 
-#[inline]
-pub static CCI_STATIC: usize = 34;
+pub const CCI_CONST: usize = 34;
diff --git a/src/test/auxiliary/xcrate_static_addresses.rs b/src/test/auxiliary/xcrate_static_addresses.rs
index 652f11a71ec..d0da80e31b9 100644
--- a/src/test/auxiliary/xcrate_static_addresses.rs
+++ b/src/test/auxiliary/xcrate_static_addresses.rs
@@ -8,13 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[inline(never)]
 pub static global: isize = 3;
 
-#[inline(never)]
 static global0: isize = 4;
 
-#[inline(never)]
 pub static global2: &'static isize = &global0;
 
 pub fn verify_same(a: &'static isize) {
diff --git a/src/test/run-pass/sepcomp-cci.rs b/src/test/run-pass/sepcomp-cci.rs
index a1c5ad113c7..d3d3de0e2c0 100644
--- a/src/test/run-pass/sepcomp-cci.rs
+++ b/src/test/run-pass/sepcomp-cci.rs
@@ -16,23 +16,23 @@
 
 
 extern crate sepcomp_cci_lib;
-use sepcomp_cci_lib::{cci_fn, CCI_STATIC};
+use sepcomp_cci_lib::{cci_fn, CCI_CONST};
 
 fn call1() -> usize {
-    cci_fn() + CCI_STATIC
+    cci_fn() + CCI_CONST
 }
 
 mod a {
-    use sepcomp_cci_lib::{cci_fn, CCI_STATIC};
+    use sepcomp_cci_lib::{cci_fn, CCI_CONST};
     pub fn call2() -> usize {
-        cci_fn() + CCI_STATIC
+        cci_fn() + CCI_CONST
     }
 }
 
 mod b {
-    use sepcomp_cci_lib::{cci_fn, CCI_STATIC};
+    use sepcomp_cci_lib::{cci_fn, CCI_CONST};
     pub fn call3() -> usize {
-        cci_fn() + CCI_STATIC
+        cci_fn() + CCI_CONST
     }
 }