From b0060d1056d6d1752d91652261de97db909c7862 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 31 Jul 2017 12:51:38 +0200 Subject: [PATCH] configure: un-namespace remaining non-inline configure tests only few tests remain, and many of these were mis-classified anyway. Change-Id: Ic3bc96928a0c79fe77b9ec10e6508d4822f18df2 Reviewed-by: Thiago Macieira --- .../{common => }/atomicfptr/icc2016_mac.diff | 0 .../{common => }/atomicfptr/qnx66.txt | 0 config.tests/{common => }/avx512/avx512.cpp | 0 config.tests/{common => }/avx512/avx512.pro | 0 config.tests/{mac => }/corewlan/corewlan.pro | 0 .../{mac => }/corewlan/corewlantest.mm | 0 .../{unix => }/gnu-libiconv/gnu-libiconv.cpp | 0 .../{unix => }/gnu-libiconv/gnu-libiconv.pro | 0 config.tests/{unix => }/iconv/iconv.cpp | 0 config.tests/{unix => }/iconv/iconv.pro | 0 config.tests/{unix => }/openssl/openssl.cpp | 0 config.tests/{unix => }/openssl/openssl.pro | 0 config.tests/{unix => }/stl/stl.pro | 0 config.tests/{unix => }/stl/stltest.cpp | 0 .../{unix => }/sun-libiconv/sun-libiconv.pro | 0 .../{common => }/verifyspec/verifyspec.cpp | 0 .../{common => }/verifyspec/verifyspec.pro | 0 .../{common => }/xlocalescanprint/qglobal.h | 0 .../xlocalescanprint/xlocalescanprint.cpp | 0 .../xlocalescanprint/xlocalescanprint.pro | 0 configure.json | 22 +++++++++---------- src/corelib/configure.json | 10 ++++----- src/network/configure.json | 6 ++--- 23 files changed, 19 insertions(+), 19 deletions(-) rename config.tests/{common => }/atomicfptr/icc2016_mac.diff (100%) rename config.tests/{common => }/atomicfptr/qnx66.txt (100%) rename config.tests/{common => }/avx512/avx512.cpp (100%) rename config.tests/{common => }/avx512/avx512.pro (100%) rename config.tests/{mac => }/corewlan/corewlan.pro (100%) rename config.tests/{mac => }/corewlan/corewlantest.mm (100%) rename config.tests/{unix => }/gnu-libiconv/gnu-libiconv.cpp (100%) rename config.tests/{unix => }/gnu-libiconv/gnu-libiconv.pro (100%) rename config.tests/{unix => }/iconv/iconv.cpp (100%) rename config.tests/{unix => }/iconv/iconv.pro (100%) rename config.tests/{unix => }/openssl/openssl.cpp (100%) rename config.tests/{unix => }/openssl/openssl.pro (100%) rename config.tests/{unix => }/stl/stl.pro (100%) rename config.tests/{unix => }/stl/stltest.cpp (100%) rename config.tests/{unix => }/sun-libiconv/sun-libiconv.pro (100%) rename config.tests/{common => }/verifyspec/verifyspec.cpp (100%) rename config.tests/{common => }/verifyspec/verifyspec.pro (100%) rename config.tests/{common => }/xlocalescanprint/qglobal.h (100%) rename config.tests/{common => }/xlocalescanprint/xlocalescanprint.cpp (100%) rename config.tests/{common => }/xlocalescanprint/xlocalescanprint.pro (100%) diff --git a/config.tests/common/atomicfptr/icc2016_mac.diff b/config.tests/atomicfptr/icc2016_mac.diff similarity index 100% rename from config.tests/common/atomicfptr/icc2016_mac.diff rename to config.tests/atomicfptr/icc2016_mac.diff diff --git a/config.tests/common/atomicfptr/qnx66.txt b/config.tests/atomicfptr/qnx66.txt similarity index 100% rename from config.tests/common/atomicfptr/qnx66.txt rename to config.tests/atomicfptr/qnx66.txt diff --git a/config.tests/common/avx512/avx512.cpp b/config.tests/avx512/avx512.cpp similarity index 100% rename from config.tests/common/avx512/avx512.cpp rename to config.tests/avx512/avx512.cpp diff --git a/config.tests/common/avx512/avx512.pro b/config.tests/avx512/avx512.pro similarity index 100% rename from config.tests/common/avx512/avx512.pro rename to config.tests/avx512/avx512.pro diff --git a/config.tests/mac/corewlan/corewlan.pro b/config.tests/corewlan/corewlan.pro similarity index 100% rename from config.tests/mac/corewlan/corewlan.pro rename to config.tests/corewlan/corewlan.pro diff --git a/config.tests/mac/corewlan/corewlantest.mm b/config.tests/corewlan/corewlantest.mm similarity index 100% rename from config.tests/mac/corewlan/corewlantest.mm rename to config.tests/corewlan/corewlantest.mm diff --git a/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp b/config.tests/gnu-libiconv/gnu-libiconv.cpp similarity index 100% rename from config.tests/unix/gnu-libiconv/gnu-libiconv.cpp rename to config.tests/gnu-libiconv/gnu-libiconv.cpp diff --git a/config.tests/unix/gnu-libiconv/gnu-libiconv.pro b/config.tests/gnu-libiconv/gnu-libiconv.pro similarity index 100% rename from config.tests/unix/gnu-libiconv/gnu-libiconv.pro rename to config.tests/gnu-libiconv/gnu-libiconv.pro diff --git a/config.tests/unix/iconv/iconv.cpp b/config.tests/iconv/iconv.cpp similarity index 100% rename from config.tests/unix/iconv/iconv.cpp rename to config.tests/iconv/iconv.cpp diff --git a/config.tests/unix/iconv/iconv.pro b/config.tests/iconv/iconv.pro similarity index 100% rename from config.tests/unix/iconv/iconv.pro rename to config.tests/iconv/iconv.pro diff --git a/config.tests/unix/openssl/openssl.cpp b/config.tests/openssl/openssl.cpp similarity index 100% rename from config.tests/unix/openssl/openssl.cpp rename to config.tests/openssl/openssl.cpp diff --git a/config.tests/unix/openssl/openssl.pro b/config.tests/openssl/openssl.pro similarity index 100% rename from config.tests/unix/openssl/openssl.pro rename to config.tests/openssl/openssl.pro diff --git a/config.tests/unix/stl/stl.pro b/config.tests/stl/stl.pro similarity index 100% rename from config.tests/unix/stl/stl.pro rename to config.tests/stl/stl.pro diff --git a/config.tests/unix/stl/stltest.cpp b/config.tests/stl/stltest.cpp similarity index 100% rename from config.tests/unix/stl/stltest.cpp rename to config.tests/stl/stltest.cpp diff --git a/config.tests/unix/sun-libiconv/sun-libiconv.pro b/config.tests/sun-libiconv/sun-libiconv.pro similarity index 100% rename from config.tests/unix/sun-libiconv/sun-libiconv.pro rename to config.tests/sun-libiconv/sun-libiconv.pro diff --git a/config.tests/common/verifyspec/verifyspec.cpp b/config.tests/verifyspec/verifyspec.cpp similarity index 100% rename from config.tests/common/verifyspec/verifyspec.cpp rename to config.tests/verifyspec/verifyspec.cpp diff --git a/config.tests/common/verifyspec/verifyspec.pro b/config.tests/verifyspec/verifyspec.pro similarity index 100% rename from config.tests/common/verifyspec/verifyspec.pro rename to config.tests/verifyspec/verifyspec.pro diff --git a/config.tests/common/xlocalescanprint/qglobal.h b/config.tests/xlocalescanprint/qglobal.h similarity index 100% rename from config.tests/common/xlocalescanprint/qglobal.h rename to config.tests/xlocalescanprint/qglobal.h diff --git a/config.tests/common/xlocalescanprint/xlocalescanprint.cpp b/config.tests/xlocalescanprint/xlocalescanprint.cpp similarity index 100% rename from config.tests/common/xlocalescanprint/xlocalescanprint.cpp rename to config.tests/xlocalescanprint/xlocalescanprint.cpp diff --git a/config.tests/common/xlocalescanprint/xlocalescanprint.pro b/config.tests/xlocalescanprint/xlocalescanprint.pro similarity index 100% rename from config.tests/common/xlocalescanprint/xlocalescanprint.pro rename to config.tests/xlocalescanprint/xlocalescanprint.pro diff --git a/configure.json b/configure.json index 80278b3b69f..6221c9803ac 100644 --- a/configure.json +++ b/configure.json @@ -229,7 +229,7 @@ "verifyspec": { "label": "valid makespec", "type": "verifySpec", - "test": "common/verifyspec" + "test": "verifyspec" }, "architecture": { "label": "target architecture", @@ -256,7 +256,7 @@ "stl": { "label": "STL compatibility", "type": "compile", - "test": "unix/stl" + "test": "stl" }, "c++14": { "label": "C++14 support", @@ -497,55 +497,55 @@ "avx512f": { "label": "AVX512 F instructions", "type": "compile", - "test": "common/avx512", + "test": "avx512", "args": "AVX512=F" }, "avx512er": { "label": "AVX512 ER instructions", "type": "compile", - "test": "common/avx512", + "test": "avx512", "args": "AVX512=ER" }, "avx512cd": { "label": "AVX512 CD instructions", "type": "compile", - "test": "common/avx512", + "test": "avx512", "args": "AVX512=CD" }, "avx512pf": { "label": "AVX512 PF instructions", "type": "compile", - "test": "common/avx512", + "test": "avx512", "args": "AVX512=PF" }, "avx512dq": { "label": "AVX512 DQ instructions", "type": "compile", - "test": "common/avx512", + "test": "avx512", "args": "AVX512=DQ" }, "avx512bw": { "label": "AVX512 BW instructions", "type": "compile", - "test": "common/avx512", + "test": "avx512", "args": "AVX512=BW" }, "avx512vl": { "label": "AVX512 VL instructions", "type": "compile", - "test": "common/avx512", + "test": "avx512", "args": "AVX512=VL" }, "avx512ifma": { "label": "AVX512 IFMA instructions", "type": "compile", - "test": "common/avx512", + "test": "avx512", "args": "AVX512=IFMA" }, "avx512vbmi": { "label": "AVX512 VBMI instructions", "type": "compile", - "test": "common/avx512", + "test": "avx512", "args": "AVX512=VBMI" }, "mips_dsp": { diff --git a/src/corelib/configure.json b/src/corelib/configure.json index 5596280250c..91f7bb4fd65 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -49,7 +49,7 @@ "gnu_iconv": { "label": "GNU libiconv", "export": "iconv", - "test": "unix/gnu-libiconv", + "test": "gnu-libiconv", "sources": [ "-liconv" ] @@ -267,12 +267,12 @@ "posix-iconv": { "label": "POSIX iconv", "type": "compile", - "test": "unix/iconv" + "test": "iconv" }, "sun-iconv": { "label": "SUN libiconv", "type": "compile", - "test": "unix/sun-libiconv" + "test": "sun-libiconv" }, "inotify": { "label": "inotify", @@ -364,7 +364,7 @@ "xlocalescanprint": { "label": "xlocale.h (or equivalents)", "type": "compile", - "test": "common/xlocalescanprint" + "test": "xlocalescanprint" } }, @@ -774,7 +774,7 @@ You need to use libdouble-conversion for double/string conversion." "condition": "!tests.atomicfptr", "message": "detected a std::atomic implementation that fails for function pointers. Please apply the patch corresponding to your Standard Library vendor, found in - qtbase/config.tests/common/atomicfptr" + qtbase/config.tests/atomicfptr" } ], diff --git a/src/network/configure.json b/src/network/configure.json index c77004d4ba2..6e7ce250515 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -25,7 +25,7 @@ "corewlan": { "label": "CoreWLan", "export": "", - "test": "mac/corewlan", + "test": "corewlan", "sources": [ "-framework CoreWLAN -framework Foundation" ] @@ -53,7 +53,7 @@ "openssl_headers": { "label": "OpenSSL Headers", "export": "openssl", - "test": "unix/openssl", + "test": "openssl", "sources": [ { "comment": "placeholder for OPENSSL_PATH", @@ -63,7 +63,7 @@ }, "openssl": { "label": "OpenSSL", - "test": "unix/openssl", + "test": "openssl", "sources": [ { "type": "openssl" }, {