summaryrefslogtreecommitdiff
path: root/config.tests/unix/mysql
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2017-08-01 18:30:33 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-08-02 16:37:48 +0000
commitf54f7d847099db448223fd630c5416b6fbd84c9e (patch)
treebb3969221b65a426b89020875ff5e16a8c5247e7 /config.tests/unix/mysql
parent90588d57d71e1eedf6becd3ebf505f3bd67b592b (diff)
downloadqtbase-f54f7d847099db448223fd630c5416b6fbd84c9e.tar.gz
configure: Add a feature to write tests in the .json file
We're adding a lot of unnecessary files that end up later as cargo-cult, for at most a handful of lines. So instead move the testcases directly into the .json file. The following sources were not inlined, because multiple tests share them, and the inlining infra does not support that (yet): - avx512 - openssl - gnu-libiconv/sun-libiconv (there is also a command line option to select the exact variant, which makes it hard/impossible to properly coalesce the library sources) The following sources were not inlined because of "complications": - verifyspec contains a lengthy function in the project file - stl contains lots of code in the source file - xlocalescanprint includes a private header from the source tree via a relative path, which we can't do, as the test's physical location is variable. - corewlan uses objective c++, which the inline system doesn't support reduce_relocs and reduce_exports now create libraries with main(), which is weird enough, but doesn't hurt. Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: Ic3a088f9f08a4fd7ae91fffd14ce8a262021cca0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'config.tests/unix/mysql')
-rw-r--r--config.tests/unix/mysql/mysql.cpp49
-rw-r--r--config.tests/unix/mysql/mysql.pro2
2 files changed, 0 insertions, 51 deletions
diff --git a/config.tests/unix/mysql/mysql.cpp b/config.tests/unix/mysql/mysql.cpp
deleted file mode 100644
index 3f83cb1e68..0000000000
--- a/config.tests/unix/mysql/mysql.cpp
+++ /dev/null
@@ -1,49 +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$
-**
-****************************************************************************/
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(WIN64) || defined(_WIN64) || defined(__WIN64__)
-#include <windows.h>
-#endif
-
-#include "mysql.h"
-
-int main(int, char **)
-{
- mysql_get_client_version();
- return 0;
-}
diff --git a/config.tests/unix/mysql/mysql.pro b/config.tests/unix/mysql/mysql.pro
deleted file mode 100644
index 745f9ee0fb..0000000000
--- a/config.tests/unix/mysql/mysql.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = mysql.cpp
-CONFIG -= qt dylib