Increase test coverage on OS X, by re-enabling the none/tests/amd64/avx-1 regression...

n-i-bz

(Unfortunately I don’t have right here the hw support, but build environment works)

$ perl tests/vg_regtest none/tests/amd64/avx-1
avx-1:           (skipping, prereq failed: test -x avx-1 && ../../../tests/x86_amd64_features amd64-avx)

== 0 tests, 0 stderr failures, 0 stdout failures, 0 stderrB failures, 0 stdoutB failures, 0 post failures ==

On OS X 10.10

Before:

== 594 tests, 215 stderr failures, 9 stdout failures, 0 stderrB failures, 0 stdoutB failures, 30 post failures ==

After:

== 594 tests, 215 stderr failures, 9 stdout failures, 0 stderrB failures, 0 stdoutB failures, 30 post failures ==

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15550

diff --git a/none/tests/amd64/Makefile.am b/none/tests/amd64/Makefile.am
index e1fff6c022f9b9d48c997cee49176d1ef79d2b4a..7b259445749075efd5847a7430c0716701ad6ba3 100644 (file)
--- a/none/tests/amd64/Makefile.am
+++ b/none/tests/amd64/Makefile.am
@@ -105,6 +105,11 @@ check_PROGRAMS = \
 if BUILD_ADDR32_TESTS
  check_PROGRAMS += asorep
 endif
+if BUILD_AVX_TESTS
+if BUILD_VPCLMULQDQ_TESTS
+  check_PROGRAMS += avx-1
+endif
+endif
 if BUILD_SSSE3_TESTS
  check_PROGRAMS += ssse3_misaligned
 endif
@@ -147,11 +152,6 @@ if ! VGCONF_OS_IS_DARWIN
 if BUILD_LOOPNEL_TESTS
    check_PROGRAMS += loopnel
 endif
-if BUILD_AVX_TESTS
-if BUILD_VPCLMULQDQ_TESTS
-   check_PROGRAMS += avx-1
-endif
-endif
 if BUILD_AVX2_TESTS
 if !COMPILER_IS_ICC
    check_PROGRAMS += avx2-1

diff --git a/none/tests/amd64/avx-1.c b/none/tests/amd64/avx-1.c
index fef068dfcdabcc337d30572f876dbaf04624ab34..11759f25d66b562ee0587c0989e4c29423156979 100644 (file)
--- a/none/tests/amd64/avx-1.c
+++ b/none/tests/amd64/avx-1.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <malloc.h>
+#include "tests/malloc.h"
 
 typedef  unsigned char           UChar;
 typedef  unsigned int            UInt;
@@ -63,7 +63,7 @@ void randBlock ( Block* b )
     \
     __attribute__ ((noinline)) static void test_##_name ( void )   \
     { \
-       Block* b = memalign(32, sizeof(Block)); \
+       Block* b = memalign32(sizeof(Block)); \
        randBlock(b); \
        printf("%s(reg)\n", #_name); \
        showBlock("before", b); \