aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/blackbox/testdata-qt
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2017-08-16 01:54:24 -0700
committerJake Petroules <jake.petroules@qt.io>2017-08-23 08:55:49 +0000
commit800eab6fc2ad4203bea4ab4eb2b20862c6edb2a2 (patch)
treef2d8fbf93416a0a7c67f2ca9b6fa9201bf8aa18b /tests/auto/blackbox/testdata-qt
parentca1d2a7ffdabcb3de4477427d23b7d309ec33c02 (diff)
Move all remaining manual tests into autotests
Most of these are easily automatable, and are more useful being run automatically in every integration rather than manually, and probably never. Adapt tests as necessary. Change-Id: Ie158481ad8c45ad8d808feacd98c71972dc18900 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata-qt')
-rw-r--r--tests/auto/blackbox/testdata-qt/pkgconfig/main.cpp46
-rw-r--r--tests/auto/blackbox/testdata-qt/pkgconfig/pkgconfig.qbs18
2 files changed, 64 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata-qt/pkgconfig/main.cpp b/tests/auto/blackbox/testdata-qt/pkgconfig/main.cpp
new file mode 100644
index 000000000..2080b5077
--- /dev/null
+++ b/tests/auto/blackbox/testdata-qt/pkgconfig/main.cpp
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifdef QT_CORE_LIB
+#include <QCoreApplication>
+#include <QDebug>
+#else
+#include <iostream>
+#endif
+
+int main(int argc, char **argv)
+{
+#ifdef QT_CORE_LIB
+ QCoreApplication app(argc, argv);
+ qDebug() << "Hello world!";
+#else
+ (void)argc;
+ (void)argv;
+ std::cout << "Skip this test" << std::endl;
+#endif
+}
diff --git a/tests/auto/blackbox/testdata-qt/pkgconfig/pkgconfig.qbs b/tests/auto/blackbox/testdata-qt/pkgconfig/pkgconfig.qbs
new file mode 100644
index 000000000..132ce337a
--- /dev/null
+++ b/tests/auto/blackbox/testdata-qt/pkgconfig/pkgconfig.qbs
@@ -0,0 +1,18 @@
+import qbs 1.0
+import qbs.Probes
+
+Project {
+ property string name: 'pkgconfig'
+ CppApplication {
+ name: project.name
+ Probes.PkgConfigProbe {
+ id: pkgConfig
+ name: "QtCore"
+ minVersion: '4.0.0'
+ maxVersion: '5.99.99'
+ }
+ files: 'main.cpp'
+ cpp.cxxFlags: pkgConfig.cflags
+ cpp.linkerFlags: pkgConfig.libs
+ }
+}