Fix align asserts on i686 and S390x architectures.

Hopefully...
bitshifter · Jul 14, 2021 · dc60e20 · dc60e20
1 parent bd8b30e
commit dc60e20
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/tests/affine2.rs b/tests/affine2.rs
@@ -209,7 +209,7 @@ mod daffine2 {
     fn test_align() {
         use std::mem;
         assert_eq!(48, mem::size_of::<DAffine2>());
-        assert_eq!(8, mem::align_of::<DAffine2>());
+        assert_eq!(mem::align_of::<f64>(), mem::align_of::<DAffine2>());
     }
 
     impl_affine2_tests!(f64, DAffine2, DVec2);

diff --git a/tests/affine3.rs b/tests/affine3.rs
@@ -350,7 +350,7 @@ mod daffine3 {
     fn test_align() {
         use std::mem;
         assert_eq!(96, mem::size_of::<DAffine3>());
-        assert_eq!(8, mem::align_of::<DAffine3>());
+        assert_eq!(mem::align_of::<f64>(), mem::align_of::<DAffine3>());
     }
 
     impl_affine3_tests!(f64, DAffine3, DQuat, DVec3);

diff --git a/tests/mat2.rs b/tests/mat2.rs
@@ -271,7 +271,7 @@ mod dmat2 {
     fn test_align() {
         use std::mem;
         assert_eq!(32, mem::size_of::<DMat2>());
-        assert_eq!(8, mem::align_of::<DMat2>());
+        assert_eq!(mem::align_of::<f64>(), mem::align_of::<DMat2>());
     }
 
     impl_mat2_tests!(f64, const_dmat2, dmat2, DMat2, DMat3, dvec2, DVec2);

diff --git a/tests/mat3.rs b/tests/mat3.rs
@@ -455,7 +455,7 @@ mod dmat3 {
     fn test_align() {
         use std::mem;
         assert_eq!(72, mem::size_of::<DMat3>());
-        assert_eq!(8, mem::align_of::<DMat3>());
+        assert_eq!(mem::align_of::<f64>(), mem::align_of::<DMat3>());
     }
 
     impl_mat3_tests!(

diff --git a/tests/mat4.rs b/tests/mat4.rs
@@ -746,7 +746,7 @@ mod dmat4 {
     fn test_align() {
         use std::mem;
         assert_eq!(128, mem::size_of::<DMat4>());
-        assert_eq!(8, mem::align_of::<DMat4>());
+        assert_eq!(mem::align_of::<f64>(), mem::align_of::<DMat4>());
     }
 
     impl_mat4_tests!(

diff --git a/tests/quat.rs b/tests/quat.rs
@@ -558,7 +558,7 @@ mod dquat {
     fn test_align() {
         use std::mem;
         assert_eq!(32, mem::size_of::<DQuat>());
-        assert_eq!(8, mem::align_of::<DQuat>());
+        assert_eq!(mem::align_of::<f64>(), mem::align_of::<DQuat>());
     }
 
     impl_quat_tests!(f64, const_dquat, dquat, DMat3, DMat4, DQuat, DVec3, DVec4);

diff --git a/tests/vec2.rs b/tests/vec2.rs
@@ -747,7 +747,7 @@ mod dvec2 {
     fn test_align() {
         use core::mem;
         assert_eq!(16, mem::size_of::<DVec2>());
-        assert_eq!(8, mem::align_of::<DVec2>());
+        assert_eq!(mem::align_of::<f64>(), mem::align_of::<DVec2>());
         assert_eq!(2, mem::size_of::<BVec2>());
         assert_eq!(1, mem::align_of::<BVec2>());
     }

diff --git a/tests/vec3.rs b/tests/vec3.rs
@@ -917,7 +917,7 @@ mod dvec3 {
     fn test_align() {
         use std::mem;
         assert_eq!(24, mem::size_of::<DVec3>());
-        assert_eq!(8, mem::align_of::<DVec3>());
+        assert_eq!(mem::align_of::<f64>(), mem::align_of::<DVec3>());
         assert_eq!(3, mem::size_of::<BVec3>());
         assert_eq!(1, mem::align_of::<BVec3>());
     }

diff --git a/tests/vec4.rs b/tests/vec4.rs
@@ -830,7 +830,7 @@ mod vec4 {
     fn test_align() {
         use std::mem;
         assert_eq!(16, mem::size_of::<Vec4>());
-        if cfg!(feature = "scalar-math") {
+        if cfg!(any(not(target_feature = "sse2"), feature = "scalar-math")) {
             assert_eq!(4, mem::align_of::<Vec4>());
             assert_eq!(4, mem::size_of::<Vec4Mask>());
             assert_eq!(1, mem::align_of::<Vec4Mask>());
@@ -934,7 +934,7 @@ mod dvec4 {
     fn test_align() {
         use std::mem;
         assert_eq!(32, mem::size_of::<DVec4>());
-        assert_eq!(8, mem::align_of::<DVec4>());
+        assert_eq!(mem::align_of::<f64>(), mem::align_of::<DVec4>());
         assert_eq!(4, mem::size_of::<BVec4>());
         assert_eq!(1, mem::align_of::<BVec4>());
     }