diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 22d41c27c..bc0ff10e5 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -117,7 +117,7 @@ jobs: -DQT_VERSION_MAJOR=6 \ -DBUILD_WITH_KF=ON \ -DBUILD_KF=OFF \ - -DPACKAGE_TESTS=OFF \ + -DPACKAGE_TESTS=ON \ -DCMAKE_POLICY_DEFAULT_CMP0077=NEW \ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DQET_EXPORT_PROJECT_DB=ON \ diff --git a/tests/qttest/tst_qetcontainer.cpp b/tests/qttest/tst_qetcontainer.cpp index a8414759a..acb8b0913 100644 --- a/tests/qttest/tst_qetcontainer.cpp +++ b/tests/qttest/tst_qetcontainer.cpp @@ -440,7 +440,9 @@ private slots: // columns in the same order, same types; written without keys (format 4) void specMatchesSchema() { - const QString spec = QString::fromUtf8(read(QStringLiteral(QET_FORMAT_SPEC))); + // A Windows checkout may give the file CRLF line endings + const QString spec = QString::fromUtf8(read(QStringLiteral(QET_FORMAT_SPEC))) + .remove(QLatin1Char('\r')); const int from = spec.indexOf(QStringLiteral("```sql\n")); const int to = spec.indexOf(QStringLiteral("```"), from + 7); QVERIFY2(from >= 0 && to > from, "no schema in QETZ-FORMAT.md");