AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the test case

Browse Source 
If the MKSPEC we get is an absolute path, we should
pass that one on to qmake. Otherwise it'll try to
find the mkspec in the install location. This fails
as 'make check' is being run before installation.

Task-number: QTBUG-21402
Change-Id: Ie872546f2ee7c5d737e50a1779637e393538ccc2
Reviewed-on: http://codereview.qt-project.org/4999
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
This commit is contained in:
Lars Knoll 2011-09-15 14:40:09 +02:00 committed by Qt by Nokia
parent e2ea8e958c
commit 98baa289cc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
View File

@ -68,6 +68,9 @@
static QString makespec()
{
static const char default_makespec[] = DEFAULT_MAKESPEC;
if (default_makespec[0] == '/')
return QString::fromLatin1(default_makespec);
const char *p;
for (p = default_makespec + sizeof(default_makespec) - 1; p >= default_makespec; --p)
if (*p == '/' || *p == '\\')

2
tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro
View File

@ -13,5 +13,3 @@ QT = core
include(externaltests.pri)
CONFIG += parallel_test
CONFIG += insignificant_test # QTBUG-21402