diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-09-15 14:40:09 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-17 07:36:26 +0200 |
commit | 98baa289cc38af3537b6dff60b1eedf98a069743 (patch) | |
tree | 511028c5785e65b47364f8634acd05d05d0cd854 /tests/auto/corelib/tools/qsharedpointer | |
parent | e2ea8e958c3ca5360dc3e0b0cb10df246b8b551c (diff) |
Fix the test case
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>
Diffstat (limited to 'tests/auto/corelib/tools/qsharedpointer')
-rw-r--r-- | tests/auto/corelib/tools/qsharedpointer/externaltests.cpp | 3 | ||||
-rw-r--r-- | tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp index 1bfa1c10a0..e67bbd93ff 100644 --- a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp +++ b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp @@ -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 == '\\') diff --git a/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro b/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro index fc791f485c..014006e782 100644 --- a/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro +++ b/tests/auto/corelib/tools/qsharedpointer/qsharedpointer.pro @@ -13,5 +13,3 @@ QT = core include(externaltests.pri) CONFIG += parallel_test - -CONFIG += insignificant_test # QTBUG-21402 |