Add a configure check for C++20 and compile more tests in more C++ ve…

…rsions

Increases test coverage.

Change-Id: Ie996fea85401175d5fc5a7182fb2a0c35e7739c7
Reviewed-on: https://codereview.kdab.com/c/kdab/KDToolBox/+/98817
Tested-by: Continuous Integration <[email protected]>
Reviewed-by: Sérgio Martins <[email protected]>

KDToolBox.pro

@@ -1,4 +1,9 @@
 TEMPLATE = subdirs
+
+include(configtests.pri)
+
+config_cpp20:message("Enabling C++20 tests")
+
 SUBDIRS += \
     cpp \
     qt \

config.tests/cpp20/cpp20.cpp

@@ -0,0 +1,3 @@
+#include <version>
+
+int main() {}

config.tests/cpp20/cpp20.pro

@@ -0,0 +1,4 @@
+CONFIG -= qt
+CONFIG += c++2a
+
+SOURCES = cpp20.cpp

configtests.pri

@@ -0,0 +1,13 @@
+# configure style tests
+# QMAKE_CONFIG_TESTS_DIR defaults to dir of current .pro files + config.tests
+# sets config_$test if successful, e.g. config_cpp11 for test config.tests/cpp11
+
+load(configure)
+
+log("Running configure tests...$$escape_expand(\\n)")
+CONFIG_TESTS = $$files($$QMAKE_CONFIG_TESTS_DIR/*.pro, true)
+for(test, CONFIG_TESTS) {
+    test = $$basename(test)
+    test ~= s/\\.pro$//
+    qtCompileTest($$test)
+}

cpp/duplicatetracker/tests/duplicatetracker/cxx20/cxx20.pro

@@ -0,0 +1,6 @@
+CONFIG += testcase moc
+TARGET = tst_duplicatetracker_20
+QT = core testlib
+CONFIG += c++2a
+SOURCES += $$PWD/../tst_duplicatetracker.cpp
+INCLUDEPATH += ../../../include

cpp/duplicatetracker/tests/duplicatetracker/duplicatetracker.pro

@@ -3,3 +3,6 @@ TEMPLATE = subdirs
 SUBDIRS += \
     cxx11 \
     cxx17 \
+
+config_cpp20:SUBDIRS += \
+    cxx20 \

cpp/future-backports/tests/k20/erase_if/cxx11/cxx11.pro

@@ -0,0 +1,6 @@
+CONFIG += testcase
+TARGET = tst_erase_if_11
+QT = core testlib
+CONFIG += c++11
+SOURCES += ../tst_erase_if.cpp
+INCLUDEPATH += ../../../../include

cpp/future-backports/tests/k20/erase_if/cxx14/cxx14.pro

@@ -0,0 +1,6 @@
+CONFIG += testcase
+TARGET = tst_erase_if_14
+QT = core testlib
+CONFIG += c++14
+SOURCES += ../tst_erase_if.cpp
+INCLUDEPATH += ../../../../include

cpp/future-backports/tests/k20/erase_if/cxx17/cxx17.pro

@@ -0,0 +1,6 @@
+CONFIG += testcase
+TARGET = tst_erase_if_17
+QT = core testlib
+CONFIG += c++1z
+SOURCES += ../tst_erase_if.cpp
+INCLUDEPATH += ../../../../include

cpp/future-backports/tests/k20/erase_if/cxx20/cxx20.pro

@@ -0,0 +1,6 @@
+CONFIG += testcase
+TARGET = tst_erase_if_20
+QT = core testlib
+CONFIG += c++2a
+SOURCES += ../tst_erase_if.cpp
+INCLUDEPATH += ../../../../include

cpp/future-backports/tests/k20/erase_if/erase_if.pro

@@ -1,8 +1,9 @@
-CONFIG += testcase
-TARGET = tst_erase_if
-QT = core testlib
-contains(QT_CONFIG, c++14):CONFIG *= c++14
-contains(QT_CONFIG, c++1z):CONFIG *= c++1z
-contains(QT_CONFIG, c++2a):CONFIG *= c++2a
-SOURCES += tst_erase_if.cpp
-INCLUDEPATH += ../../../include
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    cxx11 \
+    cxx14 \
+    cxx17 \
+
+config_cpp20:SUBDIRS += \
+    cxx20 \

cpp/future-backports/tests/k20/erase_if/tst_erase_if.cpp

@@ -129,7 +129,7 @@ private Q_SLOTS:
         const Container c = il;
         {
             Container copy = c;
-            QCOMPARE(k20::erase_if(copy, [&](const auto &e) { return e == v; }), expected);
+            QCOMPARE(k20::erase_if(copy, [&](const value_type<Container> &e) { return e == v; }), expected);
             if (expected > 0)
                 QVERIFY(copy != c);
             else

qt/stringtokenizer/tests/qstringtokenizer/cxx11/cxx11.pro

@@ -0,0 +1,6 @@
+CONFIG += testcase
+TARGET = tst_qstringtokenizer_11
+QT = core testlib
+CONFIG += c++11
+SOURCES += ../tst_qstringtokenizer.cpp
+INCLUDEPATH += ../../../include

qt/stringtokenizer/tests/qstringtokenizer/cxx14/cxx14.pro

@@ -0,0 +1,6 @@
+CONFIG += testcase
+TARGET = tst_qstringtokenizer_14
+QT = core testlib
+CONFIG += c++14
+SOURCES += ../tst_qstringtokenizer.cpp
+INCLUDEPATH += ../../../include

qt/stringtokenizer/tests/qstringtokenizer/cxx17/cxx17.pro

@@ -0,0 +1,6 @@
+CONFIG += testcase
+TARGET = tst_qstringtokenizer_17
+QT = core testlib
+CONFIG += c++1z
+SOURCES += ../tst_qstringtokenizer.cpp
+INCLUDEPATH += ../../../include

qt/stringtokenizer/tests/qstringtokenizer/cxx20/cxx20.pro

@@ -0,0 +1,6 @@
+CONFIG += testcase
+TARGET = tst_qstringtokenizer_20
+QT = core testlib
+CONFIG += c++2a
+SOURCES += ../tst_qstringtokenizer.cpp
+INCLUDEPATH += ../../../include

qt/stringtokenizer/tests/qstringtokenizer/qstringtokenizer.pro

@@ -1,8 +1,9 @@
-CONFIG += testcase
-TARGET = tst_qstringtokenizer
-QT = core testlib
-contains(QT_CONFIG, c++14):CONFIG *= c++14
-contains(QT_CONFIG, c++1z):CONFIG *= c++1z
-contains(QT_CONFIG, c++2a):CONFIG *= c++2a
-SOURCES += tst_qstringtokenizer.cpp
-INCLUDEPATH += ../../include
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    cxx11 \
+    cxx14 \
+    cxx17 \
+
+config_cpp20:SUBDIRS += \
+    cxx20 \