Move the AVX and SSE tests to config.tests/common

This is the first step in supporting these checks on Windows.

Change-Id: I77cfd46bd733161ad2e52c2f76a6354b95ff737d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

diff --git a/config.tests/unix/avx/avx.cpp b/config.tests/common/avx/avx.cpp
similarity index 100%
rename from config.tests/unix/avx/avx.cpp
rename to config.tests/common/avx/avx.cpp

diff --git a/config.tests/unix/avx/avx.pro b/config.tests/common/avx/avx.pro
similarity index 100%
rename from config.tests/unix/avx/avx.pro
rename to config.tests/common/avx/avx.pro

diff --git a/config.tests/unix/avx2/avx2.cpp b/config.tests/common/avx2/avx2.cpp
similarity index 100%
rename from config.tests/unix/avx2/avx2.cpp
rename to config.tests/common/avx2/avx2.cpp

diff --git a/config.tests/unix/avx2/avx2.pro b/config.tests/common/avx2/avx2.pro
similarity index 100%
rename from config.tests/unix/avx2/avx2.pro
rename to config.tests/common/avx2/avx2.pro

diff --git a/config.tests/unix/sse2/sse2.cpp b/config.tests/common/sse2/sse2.cpp
similarity index 100%
rename from config.tests/unix/sse2/sse2.cpp
rename to config.tests/common/sse2/sse2.cpp

diff --git a/config.tests/unix/sse2/sse2.pro b/config.tests/common/sse2/sse2.pro
similarity index 100%
rename from config.tests/unix/sse2/sse2.pro
rename to config.tests/common/sse2/sse2.pro

diff --git a/config.tests/unix/sse3/sse3.cpp b/config.tests/common/sse3/sse3.cpp
similarity index 100%
rename from config.tests/unix/sse3/sse3.cpp
rename to config.tests/common/sse3/sse3.cpp

diff --git a/config.tests/unix/sse3/sse3.pro b/config.tests/common/sse3/sse3.pro
similarity index 100%
rename from config.tests/unix/sse3/sse3.pro
rename to config.tests/common/sse3/sse3.pro

diff --git a/config.tests/unix/sse4_1/sse4_1.cpp b/config.tests/common/sse4_1/sse4_1.cpp
similarity index 100%
rename from config.tests/unix/sse4_1/sse4_1.cpp
rename to config.tests/common/sse4_1/sse4_1.cpp

diff --git a/config.tests/unix/sse4_1/sse4_1.pro b/config.tests/common/sse4_1/sse4_1.pro
similarity index 100%
rename from config.tests/unix/sse4_1/sse4_1.pro
rename to config.tests/common/sse4_1/sse4_1.pro

diff --git a/config.tests/unix/sse4_2/sse4_2.cpp b/config.tests/common/sse4_2/sse4_2.cpp
similarity index 100%
rename from config.tests/unix/sse4_2/sse4_2.cpp
rename to config.tests/common/sse4_2/sse4_2.cpp

diff --git a/config.tests/unix/sse4_2/sse4_2.pro b/config.tests/common/sse4_2/sse4_2.pro
similarity index 100%
rename from config.tests/unix/sse4_2/sse4_2.pro
rename to config.tests/common/sse4_2/sse4_2.pro

diff --git a/config.tests/unix/ssse3/ssse3.cpp b/config.tests/common/ssse3/ssse3.cpp
similarity index 100%
rename from config.tests/unix/ssse3/ssse3.cpp
rename to config.tests/common/ssse3/ssse3.cpp

diff --git a/config.tests/unix/ssse3/ssse3.pro b/config.tests/common/ssse3/ssse3.pro
similarity index 100%
rename from config.tests/unix/ssse3/ssse3.pro
rename to config.tests/common/ssse3/ssse3.pro

diff --git a/configure b/configure
index 5ea96ec..781c06b 100755 (executable)
--- a/configure
+++ b/configure
@@ -3757,7 +3757,7 @@ fi
 
 # detect sse2 support
 if [ "${CFG_SSE2}" = "auto" ]; then
-    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse2 "sse2" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/common/sse2 "sse2" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then
        CFG_SSE2=yes
     else
        CFG_SSE2=no
@@ -3766,7 +3766,7 @@ fi
 
 # detect sse3 support
 if [ "${CFG_SSE3}" = "auto" ]; then
-    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse3 "sse3" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/common/sse3 "sse3" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then
        CFG_SSE3=yes
     else
        CFG_SSE3=no
@@ -3775,7 +3775,7 @@ fi
 
 # detect ssse3 support
 if [ "${CFG_SSSE3}" = "auto" ]; then
-    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ssse3 "ssse3" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/common/ssse3 "ssse3" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then
        CFG_SSSE3=yes
     else
        CFG_SSSE3=no
@@ -3784,7 +3784,7 @@ fi
 
 # detect sse4.1 support
 if [ "${CFG_SSE4_1}" = "auto" ]; then
-    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse4_1 "sse4_1" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/common/sse4_1 "sse4_1" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then
        CFG_SSE4_1=yes
     else
        CFG_SSE4_1=no
@@ -3793,7 +3793,7 @@ fi
 
 # detect sse4.2 support
 if [ "${CFG_SSE4_2}" = "auto" ]; then
-    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse4_2 "sse4_2" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/common/sse4_2 "sse4_2" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then
        CFG_SSE4_2=yes
     else
        CFG_SSE4_2=no
@@ -3802,7 +3802,7 @@ fi
 
 # detect avx support
 if [ "${CFG_AVX}" = "auto" ]; then
-    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/avx "avx" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/common/avx "avx" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then
        case "$XQMAKESPEC" in
            *g++*|*-clang*)
                # Some clang versions produce internal compiler errors compiling Qt AVX code
@@ -3832,7 +3832,7 @@ if [ "${CFG_AVX}" = "no" ]; then
     CFG_AVX2=no
 fi
 if [ "${CFG_AVX2}" = "auto" ]; then
-    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/avx2 "avx2" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/common/avx2 "avx2" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then
        CFG_AVX2=yes
     else
        CFG_AVX2=no