diff options
| author | Andreas Buhr <andreas.buhr@qt.io> | 2020-10-14 20:19:38 +0200 |
|---|---|---|
| committer | Andreas Buhr <andreas.buhr@qt.io> | 2020-10-16 18:49:01 +0200 |
| commit | 16e4ae01bb0cda830224414892f7809c876ae112 (patch) | |
| tree | fe2694d441a22ccbe454779e881e2330c5373d15 /tests | |
| parent | 986c09f815ead14904fbef886d5e776b9627fee6 (diff) | |
Move file of test helpers out of directory for qtconcurrentmap tests
The test helpers are used both in the qtconcurrentmap tests and in the
qtconcurrentfilter tests. In the future, they should also be used
in generated tests. This patch moves the function out of the
qtconcurrentmap folder as it is not specific to 'map'.
Change-Id: Ie79a7ae3040a7eab7364a3aabf934158c7527b5a
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/concurrent/testhelper_functions.h (renamed from tests/auto/concurrent/qtconcurrentmap/functions.h) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp index 53b1b0fb55..28e83fbee5 100644 --- a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp +++ b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp @@ -30,7 +30,7 @@ #include <QList> #include <QtTest/QtTest> -#include "../qtconcurrentmap/functions.h" +#include "../testhelper_functions.h" class tst_QtConcurrentFilter : public QObject { diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp index 021dac86f0..804f14e628 100644 --- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp +++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp @@ -34,7 +34,7 @@ #include <QtTest/QtTest> -#include "functions.h" +#include "../testhelper_functions.h" class tst_QtConcurrentMap : public QObject { diff --git a/tests/auto/concurrent/qtconcurrentmap/functions.h b/tests/auto/concurrent/testhelper_functions.h index aeba794977..aeba794977 100644 --- a/tests/auto/concurrent/qtconcurrentmap/functions.h +++ b/tests/auto/concurrent/testhelper_functions.h |