diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-04 11:51:31 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-05 03:04:31 +0200 |
| commit | 7cfad460c56319ba89c4a3a0bbcb2e54ab1cdbc6 (patch) | |
| tree | 5df8fca668dace17eea7b6c5ed82db8e87180105 /tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp | |
| parent | c46f59fadf63b661d8611e5896f09fb85c17a00c (diff) | |
Avoid using QSKIP in lieu of compile-time checks
QSKIP is intended to be used to skip test functions that are found at
run-time to be inapplicable or unsafe. If a test function can be
determined to be inapplicable at compile-time, the entire test function
should be omitted instead of replacing the body of the test function
with a QSKIP, which only serves to slow down test runs and to inflate
test run-rates with empty, inapplicable tests.
Task-number: QTQAINFRA-278
Change-Id: Ib2025339422749cf216e87ac414a3056250bf8f9
Reviewed-on: http://codereview.qt-project.org/5942
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp')
| -rw-r--r-- | tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp index 5ed635b800..4a8a18ba6d 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp +++ b/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp @@ -73,7 +73,9 @@ private slots: #endif void incrementalResults(); void noDetatch(); +#ifndef QT_NO_STL void stlContainers(); +#endif void qFutureAssignmentLeak(); void stressTest(); public slots: @@ -2316,10 +2318,9 @@ void tst_QtConcurrentMap::noDetatch() } +#ifndef QT_NO_STL void tst_QtConcurrentMap::stlContainers() { -#ifdef QT_NO_STL - QSKIP("Qt compiled without STL support", SkipAll); std::vector<int> vector; vector.push_back(1); vector.push_back(2); @@ -2337,8 +2338,8 @@ void tst_QtConcurrentMap::stlContainers() QtConcurrent::mapped(list, mapper).waitForFinished(); QtConcurrent::blockingMap(list, multiplyBy2Immutable); -#endif } +#endif InstanceCounter ic_fn(const InstanceCounter & ic) { |