From 41baea32a8e760671f2dfb10ef2af31fd58f3678 Mon Sep 17 00:00:00 2001 From: ispyisail Date: Thu, 15 Oct 2026 12:11:29 +1300 Subject: [PATCH 1/2] Fix tst_qetcontainer on a Windows checkout (#1482) specMatchesSchema() finds the schema in QETZ-FORMAT.md by looking for "```sql\n". A Windows checkout gives the file CRLF line endings, so the marker is never found and the test fails with "no schema in QETZ-FORMAT.md". Drop the carriage returns after reading the file. Checked by converting QETZ-FORMAT.md to CRLF: the test failed with the CI message before this change and passes after it; with LF it passes both ways. All 51 cases of tst_qetcontainer pass. Co-Authored-By: Claude Opus 5.5 --- tests/qttest/tst_qetcontainer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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"); From a4ca61d48b98f0ee8b984fe2eaf7b17135bdf219 Mon Sep 17 00:00:00 2001 From: ispyisail Date: Thu, 15 Oct 2026 12:11:29 +1300 Subject: [PATCH 2/2] CI: run the unit tests in the Windows job again f06fd1130 turned them off because tst_qetcontainer failed there (#1482); the previous commit fixes that test. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/windows-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 \