kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-15 18:14:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1484 from ispyisail/fix/1482-crlf-spec-test

Browse Source 
Fix tst_qetcontainer failing on Windows (#1482)
This commit is contained in:
ispyisail
2026-10-15 13:30:41 +13:00
committed by GitHub
parent f06fd11305 a4ca61d48b
commit c65a81b0ca
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/windows-build.yml
+1 -1
View File
@@ -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 \
tests/qttest/tst_qetcontainer.cpp
+3 -1
View File
@@ -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");