1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
|
From ff1387e40e37458197c91b07acde03522403c5c8 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Fri, 25 Mar 2011 07:39:40 +0100
Subject: [PATCH] Modularized tst_headers
---
qtqa/tests/auto/headers/headers.pro | 2 +-
qtqa/tests/auto/headers/headersclean.cpp | 86 ------------------------------
qtqa/tests/auto/headers/tst_headers.cpp | 30 ++++++-----
3 files changed, 18 insertions(+), 100 deletions(-)
delete mode 100644 qtqa/tests/auto/headers/headersclean.cpp
diff --git a/qtqa/tests/auto/headers/headers.pro b/qtqa/tests/auto/headers/headers.pro
index 74e1a02..703da7c 100644
--- a/qtqa/tests/auto/headers/headers.pro
+++ b/qtqa/tests/auto/headers/headers.pro
@@ -1,3 +1,3 @@
load(qttest_p4)
-SOURCES += tst_headers.cpp headersclean.cpp
+SOURCES += tst_headers.cpp
QT = core
diff --git a/qtqa/tests/auto/headers/headersclean.cpp b/qtqa/tests/auto/headers/headersclean.cpp
deleted file mode 100644
index d2ca483..0000000
--- a/qtqa/tests/auto/headers/headersclean.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, 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.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#define QT_NO_KEYWORDS
-#define signals int
-#define slots int
-#define emit public:;
-#define foreach public:;
-#define forever public:;
-
-// include all of Qt here
-
-// core Qt
-#include <QtCore/QtCore>
-#include <QtGui/QtGui>
-#include <QtNetwork/QtNetwork>
-
-// extra
-#include <QtDBus/QtDBus>
-#include <QtDeclarative/QtDeclarative>
-#include <QtHelp/QtHelp>
-#include <QtMultimedia/QtMultimedia>
-#include <QtOpenGL/QtOpenGL>
-#include <QtScript/QtScript>
-#include <QtScriptTools/QtScriptTools>
-#include <QtSql/QtSql>
-#include <QtSvg/QtSvg>
-#include <QtTest/QtTest>
-#include <QtXml/QtXml>
-#include <QtXmlPatterns/QtXmlPatterns>
-
-// webkit:
-#include <QtWebKit/QtWebKit>
-
-// designer:
-#include <QtDesigner/QtDesigner>
-#include <QtUiTools/QtUiTools>
-
-// feature dependent:
-#ifndef QT_NO_OPENVG
-#include <QtOpenVG/QtOpenVG>
-#endif
-
-// removed in 4.7:
-//#include <QtAssistant/QtAssistant>
-
-// can't include this since it causes a linker error
-//#include <Qt3Support/Qt3Support>
diff --git a/qtqa/tests/auto/headers/tst_headers.cpp b/qtqa/tests/auto/headers/tst_headers.cpp
index b5c65ef..1da7592 100644
--- a/qtqa/tests/auto/headers/tst_headers.cpp
+++ b/qtqa/tests/auto/headers/tst_headers.cpp
@@ -74,7 +74,7 @@ private:
const QRegExp copyrightPattern;
const QRegExp licensePattern;
const QRegExp moduleTest;
- QString qtSrcDir;
+ QString qtModuleDir;
};
tst_Headers::tst_Headers() :
@@ -125,16 +125,19 @@ QStringList tst_Headers::getQDocFiles(const QString &path)
void tst_Headers::initTestCase()
{
- qtSrcDir = QString::fromLocal8Bit(qgetenv("QTSRCDIR").isEmpty()
- ? qgetenv("QTDIR")
- : qgetenv("QTSRCDIR"));
+ qtModuleDir = QString::fromLocal8Bit(qgetenv("QT_MODULE_TO_TEST"));
+ QVERIFY2(!qtModuleDir.isEmpty(), "This test needs $QT_MODULE_TO_TEST, we need it to search data and etc.");
- headers = getHeaders(qtSrcDir + "/src");
+ if (!qtModuleDir.contains("phonon") && !qtModuleDir.contains("qttools")) {
+ headers = getHeaders(qtModuleDir + "/src");
#ifndef Q_OS_WINCE
- // Windows CE does not have any headers on the test device
- QVERIFY2(!headers.isEmpty(), "No headers were found, something is wrong with the auto test setup.");
+ // Windows CE does not have any headers on the test device
+ QVERIFY2(!headers.isEmpty(), "No headers were found, something is wrong with the auto test setup.");
#endif
+ } else {
+ QTest::qWarn("Some test functions will be skipped, because we ignore them for phonon and qttools.");
+ }
QVERIFY(copyrightPattern.isValid());
QVERIFY(licensePattern.isValid());
@@ -159,11 +162,11 @@ void tst_Headers::allSourceFilesData()
};
for (int i = 0; i < sizeof(subdirs) / sizeof(subdirs[0]); ++i) {
- sourceFiles << getCppFiles(qtSrcDir + subdirs[i]);
+ sourceFiles << getCppFiles(qtModuleDir + subdirs[i]);
if (subdirs[i] != QLatin1String("/tests"))
- sourceFiles << getQmlFiles(qtSrcDir + subdirs[i]);
- sourceFiles << getHeaders(qtSrcDir + subdirs[i]);
- sourceFiles << getQDocFiles(qtSrcDir + subdirs[i]);
+ sourceFiles << getQmlFiles(qtModuleDir + subdirs[i]);
+ sourceFiles << getHeaders(qtModuleDir + subdirs[i]);
+ sourceFiles << getQDocFiles(qtModuleDir + subdirs[i]);
}
foreach (QString sourceFile, sourceFiles) {
@@ -171,7 +174,7 @@ void tst_Headers::allSourceFilesData()
|| sourceFile.contains("/tests/auto/qmake/testdata/bundle-spaces/main.cpp")
|| sourceFile.contains("/demos/embedded/fluidlauncher/pictureflow.cpp")
|| sourceFile.contains("/tools/porting/src/")
- || sourceFile.contains("/tools/assistant/lib/fulltextsearch/")
+ || sourceFile.contains("/src/assistant/lib/fulltextsearch/")
|| sourceFile.endsWith("_pch.h.cpp")
|| sourceFile.endsWith(".ui.h")
|| sourceFile.endsWith("/src/corelib/global/qconfig.h")
@@ -190,7 +193,7 @@ void tst_Headers::allHeadersData()
QTest::addColumn<QString>("header");
if (headers.isEmpty())
- QSKIP("can't find any headers in your $QTDIR/src", SkipAll);
+ QSKIP("can't find any headers in your $QT_MODULE_TO_TEST/src.", SkipAll);
foreach (QString hdr, headers) {
if (hdr.contains("/3rdparty/") || hdr.endsWith("/src/tools/uic/qclass_lib_map.h"))
@@ -283,6 +286,7 @@ void tst_Headers::macros()
|| header.contains("global/qconfig-") || header.endsWith("/qconfig.h")
|| header.contains("/src/tools/") || header.contains("/src/plugins/")
|| header.contains("/src/imports/")
+ || header.contains("/src/uitools/")
|| header.endsWith("/qiconset.h") || header.endsWith("/qfeatures.h")
|| header.endsWith("qt_windows.h"))
return;
--
1.7.4.1.48.g5673d
|
