[1/3] vcomp/tests: Reenable architecture dependent tests.

Sebastian Lackner sebastian at fds-team.de
Wed Feb 10 00:46:45 CST 2016


Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
---

These tests were disabled some time ago because they failed on ARM, but when taking
a look at the weird behavior for 64-bit atomic instructions (see patch 3), I would
prefer to reenable them.

@Andre_H: Feel free to add ARM specific tests, too.

 dlls/vcomp/tests/vcomp.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c
index 4f030d3..5c177df 100644
--- a/dlls/vcomp/tests/vcomp.c
+++ b/dlls/vcomp/tests/vcomp.c
@@ -1406,13 +1406,15 @@ static void test_atomic_integer32(void)
         { p_vcomp_atomic_mul_i4,  0x11223344, -0x77665544,   0xecccdf0 },
         { p_vcomp_atomic_or_i4,   0x11223344,  0x77665544,  0x77667744 },
         { p_vcomp_atomic_shl_i4,  0x11223344,           3, -0x76ee65e0 },
-     /* { p_vcomp_atomic_shl_i4,  0x11223344,          35, -0x76ee65e0 }, */ /* depends on Architecture */
         { p_vcomp_atomic_shl_i4, -0x11223344,           3,  0x76ee65e0 },
         { p_vcomp_atomic_shr_i4,  0x11223344,           3,   0x2244668 },
-     /* { p_vcomp_atomic_shr_i4,  0x11223344,          35,   0x2244668 }, */ /* depends on Architecture */
         { p_vcomp_atomic_shr_i4, -0x11223344,           3,  -0x2244669 },
         { p_vcomp_atomic_sub_i4,  0x11223344,  0x77665544, -0x66442200 },
         { p_vcomp_atomic_xor_i4,  0x11223344,  0x77665544,  0x66446600 },
+    #if defined(__i386__) || defined(__x86_64__)
+        { p_vcomp_atomic_shl_i4,  0x11223344,          35, -0x76ee65e0 },
+        { p_vcomp_atomic_shr_i4,  0x11223344,          35,   0x2244668 },
+    #endif
     };
     struct
     {
@@ -1424,8 +1426,10 @@ static void test_atomic_integer32(void)
         { p_vcomp_atomic_div_ui4, 0x77665544, 0x11223344,          6 },
         { p_vcomp_atomic_div_ui4, 0x77665544, 0xeeddccbc,          0 },
         { p_vcomp_atomic_shr_ui4, 0x11223344,          3,  0x2244668 },
-     /* { p_vcomp_atomic_shr_ui4, 0x11223344,         35,  0x2244668 }, */ /* depends on Architecture */
         { p_vcomp_atomic_shr_ui4, 0xeeddccbc,          3, 0x1ddbb997 },
+    #if defined(__i386__) || defined(__x86_64__)
+        { p_vcomp_atomic_shr_ui4, 0x11223344,         35,  0x2244668 },
+    #endif
     };
     int i;
 
-- 
2.7.0



More information about the wine-patches mailing list