summaryrefslogtreecommitdiffstats
path: root/config.tests/common
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-07-31 12:51:38 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-08-02 16:38:00 +0000
commitb0060d1056d6d1752d91652261de97db909c7862 (patch)
tree6f4a13108e51d349617e708a16ea13b00e9546e0 /config.tests/common
parentf54f7d847099db448223fd630c5416b6fbd84c9e (diff)
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 <thiago.macieira@intel.com>
Diffstat (limited to 'config.tests/common')
-rw-r--r--config.tests/common/atomicfptr/icc2016_mac.diff18
-rw-r--r--config.tests/common/atomicfptr/qnx66.txt3
-rw-r--r--config.tests/common/avx512/avx512.cpp103
-rw-r--r--config.tests/common/avx512/avx512.pro10
-rw-r--r--config.tests/common/verifyspec/verifyspec.cpp1
-rw-r--r--config.tests/common/verifyspec/verifyspec.pro37
-rw-r--r--config.tests/common/xlocalescanprint/qglobal.h43
-rw-r--r--config.tests/common/xlocalescanprint/xlocalescanprint.cpp62
-rw-r--r--config.tests/common/xlocalescanprint/xlocalescanprint.pro3
9 files changed, 0 insertions, 280 deletions
diff --git a/config.tests/common/atomicfptr/icc2016_mac.diff b/config.tests/common/atomicfptr/icc2016_mac.diff
deleted file mode 100644
index 5de3b6e19a..0000000000
--- a/config.tests/common/atomicfptr/icc2016_mac.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch for fixing std::atomic support for function pointers for the Intel
-Composer XE 2016 (compiler version 16.0).
-
-To apply:
- cd /opt/intel/compilers_and_libraries_2016/mac/include
- sudo patch -p1 < /path-to-this-file/icc2016_mac.diff
-
---- include/stdatomic.h.orig 2015-08-28 15:05:13.000000000 -0700
-+++ include/stdatomic.h 2015-08-28 15:19:25.000000000 -0700
-@@ -451,7 +451,7 @@
- }
- _STRONG_INLINE atomic() _DEFAULTED
- _STRONG_INLINE _CONSTEXPR atomic(T* _Ptr)
-- : atomic_address(_Ptr)
-+ : atomic_address((void*)_Ptr)
- {
- }
- _STRONG_INLINE T* operator+=(ptrdiff_t _V) volatile
diff --git a/config.tests/common/atomicfptr/qnx66.txt b/config.tests/common/atomicfptr/qnx66.txt
deleted file mode 100644
index b4ea9d65b5..0000000000
--- a/config.tests/common/atomicfptr/qnx66.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Patch is available from QNX. Please see
-
-http://www.qnx.com/download/feature.html?programid=27555
diff --git a/config.tests/common/avx512/avx512.cpp b/config.tests/common/avx512/avx512.cpp
deleted file mode 100644
index ca1a5d1357..0000000000
--- a/config.tests/common/avx512/avx512.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Intel Corporation.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the configuration of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <immintrin.h>
-
-#ifndef AVX512WANT
-# error ".pro file must define AVX512WANT macro to the AVX-512 feature to be tested"
-#endif
-
-// The following checks if __AVXx__ is defined, where x is the value in
-// AVX512WANT
-#define HAS2(x) __AVX512 ## x ## __
-#define HAS(x) HAS2(x)
-#if !HAS(AVX512WANT)
-# error "Feature not supported"
-#endif
-
-int main(int, char**argv)
-{
- /* AVX512 Foundation */
- __m512i i;
- __m512d d;
- __m512 f;
- __mmask16 m = ~1;
- i = _mm512_maskz_loadu_epi32(0, argv);
- d = _mm512_loadu_pd((double *)argv + 64);
- f = _mm512_loadu_ps((float *)argv + 128);
-
-#ifdef __AVX512ER__
- /* AVX512 Exponential and Reciprocal */
- f = _mm512_exp2a23_round_ps(f, 8);
-#endif
-#ifdef __AVX512CD__
- /* AVX512 Conflict Detection */
- i = _mm512_maskz_conflict_epi32(m, i);
-#endif
-#ifdef __AVX512PF__
- /* AVX512 Prefetch */
- _mm512_mask_prefetch_i64scatter_pd(argv, 0xf, i, 2, 2);
-#endif
-#ifdef __AVX512DQ__
- /* AVX512 Doubleword and Quadword support */
- m = _mm512_movepi32_mask(i);
-#endif
-#ifdef __AVX512BW__
- /* AVX512 Byte and Word support */
- i = _mm512_mask_loadu_epi8(i, m, argv - 8);
-#endif
-#ifdef __AVX512VL__
- /* AVX512 Vector Length */
- __m256i i2 = _mm256_maskz_loadu_epi32(0, argv);
- _mm256_mask_storeu_epi32(argv + 1, m, i2);
-#endif
-#ifdef __AVX512IFMA__
- /* AVX512 Integer Fused Multiply-Add */
- i = _mm512_madd52lo_epu64(i, i, i);
-#endif
-#ifdef __AVX512VBMI__
- /* AVX512 Vector Byte Manipulation Instructions */
- i = _mm512_permutexvar_epi8(i, i);
-#endif
-
- _mm512_mask_storeu_epi64(argv, m, i);
- _mm512_mask_storeu_ps(argv + 64, m, f);
- _mm512_mask_storeu_pd(argv + 128, m, d);
- return 0;
-}
diff --git a/config.tests/common/avx512/avx512.pro b/config.tests/common/avx512/avx512.pro
deleted file mode 100644
index 1edf5e5432..0000000000
--- a/config.tests/common/avx512/avx512.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-SOURCES = avx512.cpp
-
-!defined(AVX512, "var"): error("You must set the AVX512 variable!")
-
-varname = QMAKE_CFLAGS_AVX512$$AVX512
-value = $$eval($$varname)
-!defined($$varname, "var"): error("This compiler does not support AVX512")
-
-QMAKE_CXXFLAGS += $$value
-DEFINES += AVX512WANT=$$AVX512
diff --git a/config.tests/common/verifyspec/verifyspec.cpp b/config.tests/common/verifyspec/verifyspec.cpp
deleted file mode 100644
index bd5560bf02..0000000000
--- a/config.tests/common/verifyspec/verifyspec.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int main(int, char **) {}
diff --git a/config.tests/common/verifyspec/verifyspec.pro b/config.tests/common/verifyspec/verifyspec.pro
deleted file mode 100644
index 11a280e4ce..0000000000
--- a/config.tests/common/verifyspec/verifyspec.pro
+++ /dev/null
@@ -1,37 +0,0 @@
-SOURCES = verifyspec.cpp
-
-# Provide a function to be used by mkspecs
-defineTest(deviceSanityCheckCompiler) {
- equals(QMAKE_HOST.os, Windows): \
- sfx = .exe
- else: \
- sfx =
-
- # Build the compiler filename using the first value in QMAKE_CXX in order to
- # support tools like ccache, which give QMAKE_CXX values of the form:
- # ccache <path_to_compiler>
- compiler = $$first(QMAKE_CXX)$$sfx
-
- # Check if the binary exists with an absolute path. Do this check
- # before the CROSS_COMPILE empty check below to allow the mkspec
- # to derive the compiler path from other device options.
- exists($$compiler): return()
-
- # Check for possible reasons of failure
- # check if CROSS_COMPILE device-option is set
- isEmpty(CROSS_COMPILE): \
- error("CROSS_COMPILE needs to be set via -device-option CROSS_COMPILE=<path>")
-
- # Check if QMAKE_CXX points to an executable.
- ensurePathEnv()
- for (dir, QMAKE_PATH_ENV) {
- exists($$dir/$${compiler}): \
- return()
- }
-
- # QMAKE_CXX does not point to a compiler.
- error("Compiler $$QMAKE_CXX not found. Check the value of CROSS_COMPILE -device-option")
-}
-
-defined(qtConfSanitizeMkspec, test): \
- qtConfSanitizeMkspec()
diff --git a/config.tests/common/xlocalescanprint/qglobal.h b/config.tests/common/xlocalescanprint/qglobal.h
deleted file mode 100644
index 98de822847..0000000000
--- a/config.tests/common/xlocalescanprint/qglobal.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the config.tests of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGLOBAL_H
-#define QGLOBAL_H
-
-#endif
diff --git a/config.tests/common/xlocalescanprint/xlocalescanprint.cpp b/config.tests/common/xlocalescanprint/xlocalescanprint.cpp
deleted file mode 100644
index 2f1f28f74e..0000000000
--- a/config.tests/common/xlocalescanprint/xlocalescanprint.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the config.tests of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#define QT_BEGIN_NAMESPACE
-#define QT_END_NAMESPACE
-
-#ifdef _MSVC_VER
-#define Q_CC_MSVC _MSVC_VER
-#endif
-
-#define QT_NO_DOUBLECONVERSION
-
-#include "../../../src/corelib/tools/qdoublescanprint_p.h"
-
-int main(int argc, char **argv)
-{
-#ifdef _MSVC_VER
- _locale_t invalidLocale = NULL;
-#else
- locale_t invalidLocale = NULL;
-#endif
- double a = 3.4;
- qDoubleSnprintf(argv[0], 1, invalidLocale, "invalid format", a);
- qDoubleSscanf(argv[0], invalidLocale, "invalid format", &a, &argc);
- return 0;
-}
diff --git a/config.tests/common/xlocalescanprint/xlocalescanprint.pro b/config.tests/common/xlocalescanprint/xlocalescanprint.pro
deleted file mode 100644
index a37a01f227..0000000000
--- a/config.tests/common/xlocalescanprint/xlocalescanprint.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = xlocalescanprint.cpp
-CONFIG -= qt
-CONFIG += console