about summary refs log tree commit diff
path: root/src/libcoretest
diff options
context:
space:
mode:
authorRicho Healey <richo@psych0tik.net>2015-01-13 18:59:45 -0800
committerRicho Healey <richo@psych0tik.net>2015-01-13 18:59:45 -0800
commitc51379386cbd50e30b7c6c6d2eb618d2c982ff55 (patch)
tree803acc3db1e324bc5b2e73db952c9bb87525e9b6 /src/libcoretest
parent043a4b32d1295583a94f1658d8ccb919727976ba (diff)
downloadrust-c51379386cbd50e30b7c6c6d2eb618d2c982ff55.tar.gz
rust-c51379386cbd50e30b7c6c6d2eb618d2c982ff55.zip
Generalise pointer width tests using pointer_width
Diffstat (limited to 'src/libcoretest')
-rw-r--r--src/libcoretest/mem.rs18
1 files changed, 4 insertions, 14 deletions
diff --git a/src/libcoretest/mem.rs b/src/libcoretest/mem.rs
index 39af76ff87b..3dc209e6fcb 100644
--- a/src/libcoretest/mem.rs
+++ b/src/libcoretest/mem.rs
@@ -19,19 +19,14 @@ fn size_of_basic() {
 }
 
 #[test]
-#[cfg(any(target_arch = "x86",
-          target_arch = "arm",
-          target_arch = "mips",
-          target_arch = "mipsel",
-          target_arch = "powerpc"))]
+#[cfg(target_pointer_width = "32")]
 fn size_of_32() {
     assert_eq!(size_of::<uint>(), 4u);
     assert_eq!(size_of::<*const uint>(), 4u);
 }
 
 #[test]
-#[cfg(any(target_arch = "x86_64",
-          target_arch = "aarch64"))]
+#[cfg(target_pointer_width = "64")]
 fn size_of_64() {
     assert_eq!(size_of::<uint>(), 8u);
     assert_eq!(size_of::<*const uint>(), 8u);
@@ -53,19 +48,14 @@ fn align_of_basic() {
 }
 
 #[test]
-#[cfg(any(target_arch = "x86",
-          target_arch = "arm",
-          target_arch = "mips",
-          target_arch = "mipsel",
-          target_arch = "powerpc"))]
+#[cfg(target_pointer_width = "32")]
 fn align_of_32() {
     assert_eq!(align_of::<uint>(), 4u);
     assert_eq!(align_of::<*const uint>(), 4u);
 }
 
 #[test]
-#[cfg(any(target_arch = "x86_64",
-          target_arch = "aarch64"))]
+#[cfg(target_pointer_width = "64")]
 fn align_of_64() {
     assert_eq!(align_of::<uint>(), 8u);
     assert_eq!(align_of::<*const uint>(), 8u);