summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xscripts/qt/qtmod_test.pl2
-rw-r--r--tests/postbuild/compilerwarnings/.gitignore1
-rw-r--r--tests/postbuild/compilerwarnings/compilerwarnings.pro7
-rw-r--r--tests/postbuild/compilerwarnings/tst_compilerwarnings.cpp328
-rw-r--r--tests/postbuild/postbuild.pro3
5 files changed, 2 insertions, 339 deletions
diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl
index 43e42945..3463b51d 100755
--- a/scripts/qt/qtmod_test.pl
+++ b/scripts/qt/qtmod_test.pl
@@ -991,7 +991,7 @@ sub run_autotests
local %ENV = %ENV;
Env::Path->PATH->Prepend( canonpath catfile( $qt_gitmodule_build_dir, 'bin' ) );
- # In qt4, we need to set QTDIR to run some autotests like 'tst_bic', 'tst_compilerwarnings',
+ # In qt4, we need to set QTDIR to run some autotests like 'tst_bic',
# 'tst_symbols', etc
if ($self->{ 'qt.gitmodule' } eq 'qt') {
$ENV{ QTDIR } = $qt_gitmodule_build_dir; ## no critic
diff --git a/tests/postbuild/compilerwarnings/.gitignore b/tests/postbuild/compilerwarnings/.gitignore
deleted file mode 100644
index 3d70cafa..00000000
--- a/tests/postbuild/compilerwarnings/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tst_compilerwarnings
diff --git a/tests/postbuild/compilerwarnings/compilerwarnings.pro b/tests/postbuild/compilerwarnings/compilerwarnings.pro
deleted file mode 100644
index a1d2c9cc..00000000
--- a/tests/postbuild/compilerwarnings/compilerwarnings.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG += testcase
-TARGET = tst_compilerwarnings
-INCLUDEPATH += ..
-SOURCES += tst_compilerwarnings.cpp
-QT = core testlib
-
-CONFIG += insignificant_test # QTQAINFRA-322
diff --git a/tests/postbuild/compilerwarnings/tst_compilerwarnings.cpp b/tests/postbuild/compilerwarnings/tst_compilerwarnings.cpp
deleted file mode 100644
index b543af49..00000000
--- a/tests/postbuild/compilerwarnings/tst_compilerwarnings.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include <qcoreapplication.h>
-#include <qprocess.h>
-#include <qtemporaryfile.h>
-#include <qdebug.h>
-
-#include <QtTest/QtTest>
-
-#include "global.h"
-#include <stdlib.h>
-
-QT_USE_NAMESPACE
-
-class tst_CompilerWarnings: public QObject
-{
- Q_OBJECT
-
-private slots:
- void initTestCase();
- void cleanupTestCase();
-
- void warnings_data();
- void warnings();
-
-private:
- bool shouldIgnoreWarning(QString const&);
-
- QString qtModuleDir;
- QHash<QString, QString> modules;
- QStringList incPaths;
-};
-
-#if 0
-/*
- Return list of all documented qfeatures (QT_NO_*)
- */
-static QStringList getFeatures()
-{
- QStringList srcDirs;
- srcDirs << QString::fromLocal8Bit(qgetenv("QTDIR"))
- << QString::fromLocal8Bit(qgetenv("QTSRCDIR"));
-
- QString featurefile;
- foreach (QString dir, srcDirs) {
- QString str = dir + "/src/corelib/global/qfeatures.txt";
- if (QFile::exists(str)) {
- featurefile = str;
- break;
- }
- }
-
- if (featurefile.isEmpty()) {
- qWarning("Unable to find qfeatures.txt");
- return QStringList();
- }
-
- QFile file(featurefile);
- if (!file.open(QIODevice::ReadOnly)) {
- qWarning("Unable to open feature file '%s'", qPrintable(featurefile));
- return QStringList();
- }
-
- QStringList features;
- QTextStream s(&file);
- QRegExp regexp("Feature:\\s+(\\w+)\\s*");
- for (QString line = s.readLine(); !s.atEnd(); line = s.readLine()) {
- if (regexp.exactMatch(line))
- features << regexp.cap(1);
- }
-
- return features;
-}
-#endif
-
-void tst_CompilerWarnings::initTestCase()
-{
- QWARN("This test needs the correct qmake in PATH, we need it to generate INCPATH for qt modules.");
-
- qtModuleDir = QString::fromLocal8Bit(qgetenv("QT_MODULE_TO_TEST"));
- if (qtModuleDir.isEmpty()) {
- QSKIP("$QT_MODULE_TO_TEST is unset - nothing to test. Set QT_MODULE_TO_TEST to the path "
- "of a Qt module to test.");
- }
-
- QString configFile = qtModuleDir + "/tests/global/global.cfg";
- if (!QFile(configFile).exists()) {
- QSKIP(
- qPrintable(QString(
- "%1 does not exist. Create it if you want to run this test."
- ).arg(configFile))
- );
- }
-
- modules = qt_tests_shared_global_get_modules(configFile);
-
- QVERIFY2(modules.size() > 0, "Something is wrong in the global config file.");
-
- QString workDir = qtModuleDir + "/tests/global";
- incPaths = qt_tests_shared_global_get_include_paths(workDir, modules);
-
- QVERIFY2(incPaths.size() > 0, "Parse INCPATH failed.");
-}
-
-void tst_CompilerWarnings::cleanupTestCase()
-{
-}
-
-void tst_CompilerWarnings::warnings_data()
-{
- QTest::addColumn<QStringList>("cflags");
-
- QTest::newRow("standard") << QStringList();
- QTest::newRow("warn deprecated, fast plus, no debug") << (QStringList() << "-DQT_DEPRECATED_WARNINGS"
- << "-DQT_USE_FAST_OPERATOR_PLUS" << "-DQT_NU_DEBUG" << "-DQT_NO_DEBUG_STREAM" << "-DQT_NO_WARNING_OUTPUT");
- QTest::newRow("no deprecated, no keywords") << (QStringList() << "-DQT_NO_DEPRECATED" << "-DQT_NO_KEYWORDS");
-
-#if 0
-#ifdef Q_WS_QWS
- QStringList features = getFeatures();
- foreach (QString feature, features) {
- QStringList args;
- QString macro = QString("QT_NO_%1").arg(feature);
- args << (QString("-D%1").arg(macro));
- QTest::newRow(qPrintable(macro)) << args;
- }
-#endif
-#endif
-}
-
-void tst_CompilerWarnings::warnings()
-{
- QString workDir = qtModuleDir + "/tests/auto/compilerwarnings";
- if (!QDir::setCurrent(workDir)) {
- QWARN("Change working dir failed.");
- return;
- }
-
- QFETCH(QStringList, cflags);
-
-#if !defined(Q_CC_INTEL) && defined(Q_CC_GNU) && __GNUC__ == 3
- QSKIP("gcc 3.x outputs too many bogus warnings");
-#elif defined(QT_NO_PROCESS)
- QSKIP("This Qt build does not have QProcess support");
-#else
-
- /*static*/ QString tmpFile;
- if (tmpFile.isEmpty()) {
- QTemporaryFile tmpQFile;
- tmpQFile.open();
- tmpFile = tmpQFile.fileName();
- tmpQFile.close();
- }
- /*static*/ QString tmpSourceFile;
- bool openResult = true;
- const QString tmpBaseName("XXXXXX-test.cpp");
- const QString cppFileName(workDir + "/data/test_cpp.txt");
- QString templatePath = QDir::temp().absoluteFilePath(tmpBaseName);
- QFile tmpQSourceFile(templatePath);
- if (tmpSourceFile.isEmpty()) {
- tmpQSourceFile.open(QIODevice::ReadWrite | QIODevice::Truncate);
- tmpSourceFile = tmpQSourceFile.fileName();
- QFile cppSource(cppFileName);
- bool openResult = cppSource.open(QIODevice::ReadOnly);
- if (openResult)
- {
- QTextStream in(&cppSource);
- QTextStream out(&tmpQSourceFile);
- out << in.readAll();
- }
- }
- tmpQSourceFile.close();
- QVERIFY2(openResult, QString("Need data file \"" + cppFileName + "\"").toLatin1());
-
- QStringList args;
- QString compilerName;
-
- args << cflags;
-#if !defined(Q_CC_INTEL) && defined(Q_CC_GNU)
- compilerName = "g++";
- args << incPaths;
- args << "-I/usr/X11R6/include/";
-#ifdef Q_OS_HPUX
- args << "-I/usr/local/mesa/aCC-64/include";
-#endif
- args << "-c";
- args << "-Wall" << "-Wold-style-cast" << "-Woverloaded-virtual" << "-pedantic" << "-ansi"
- << "-Wno-long-long" << "-Wshadow" << "-Wpacked" << "-Wunreachable-code"
- << "-Wundef" << "-Wchar-subscripts" << "-Wformat-nonliteral" << "-Wformat-security"
- << "-Wcast-align"
- << "-o" << tmpFile
- << tmpSourceFile;
-#elif defined(Q_CC_XLC)
- compilerName = "xlC_r";
- args << incPaths
-# if QT_POINTER_SIZE == 8
- << "-q64"
-# endif
- << "-c" << "-o" << tmpFile
- << "-info=all"
- << tmpSourceFile;
-#elif defined(Q_CC_MSVC)
- compilerName = "cl";
- args << incPaths
- << "-nologo" << "-W3"
- << tmpSourceFile;
-#elif defined (Q_CC_SUN)
- compilerName = "CC";
- // +w or +w2 outputs too much bogus
- args << incPaths
-# if QT_POINTER_SIZE == 8
- << "-xarch=v9"
-# endif
- << "-o" << tmpFile
- << tmpSourceFile;
-#elif defined (Q_CC_HPACC)
- compilerName = "aCC";
- args << incPaths
- << "-I/usr/local/mesa/aCC-64/include"
- << "-I/opt/graphics/OpenGL/include"
-# if QT_POINTER_SIZE == 8 && !defined __ia64
- << "+DA2.0W"
-# endif
- // aCC generates too much bogus.
- << "-DQT_NO_STL" << "-c" << "-w"
- << "-o" << tmpFile
- << tmpSourceFile;
-#elif defined(Q_CC_MIPS)
- compilerName = "CC";
- args << incPaths
- << "-c"
- << "-woff" << "3303" // const qualifier on return
- << "-o" << tmpFile
- << tmpSourceFile;
-#else
- QSKIP("Test not implemented for this compiler");
-#endif
-
- QProcess proc;
- proc.start(compilerName, args, QIODevice::ReadOnly);
- QVERIFY2(proc.waitForFinished(6000000), proc.errorString().toLocal8Bit());
-
-#ifdef Q_CC_MSVC
- QString errs = QString::fromLocal8Bit(proc.readAllStandardOutput().constData());
- if (errs.startsWith(tmpBaseName))
- errs = errs.mid(tmpBaseName.size()).simplified();;
-#else
- QString errs = QString::fromLocal8Bit(proc.readAllStandardError().constData());
-#endif
- QStringList errList;
- if (!errs.isEmpty()) {
- errList = errs.split("\n");
- qDebug() << "Arguments:" << args;
- QStringList validErrors;
- foreach (QString const& err, errList) {
- bool ignore = shouldIgnoreWarning(err);
- qDebug() << err << (ignore ? " [ignored]" : "");
- if (!ignore) {
- validErrors << err;
- }
- }
- errList = validErrors;
- }
- QCOMPARE(errList.count(), 0); // verbose info how many lines of errors in output
-
- tmpQSourceFile.remove();
-#endif
-}
-
-bool tst_CompilerWarnings::shouldIgnoreWarning(QString const& warning)
-{
- if (warning.isEmpty()) {
- return true;
- }
-
- // icecc outputs warnings if some icecc node breaks
- if (warning.startsWith("ICECC[")) {
- return true;
- }
-
- // Add more bogus warnings here
-
- return false;
-}
-
-QTEST_APPLESS_MAIN(tst_CompilerWarnings)
-
-#include "tst_compilerwarnings.moc"
diff --git a/tests/postbuild/postbuild.pro b/tests/postbuild/postbuild.pro
index b221fcd0..787cf4a0 100644
--- a/tests/postbuild/postbuild.pro
+++ b/tests/postbuild/postbuild.pro
@@ -3,8 +3,7 @@ SUBDIRS += \
bic \
headers \
symbols \
- guiapplauncher \
- compilerwarnings
+ guiapplauncher
# This test is not valid for Windows CE
wince*: SUBDIRS -= guiapplauncher
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 21:22:45 +0000