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

Merge pull request #1518 from ispyisail/fix/windows-test-failures

Browse Source 
Fix the two tests that fail on Windows CI
This commit is contained in:
ispyisail
2026-10-18 19:52:27 +13:00
committed by GitHub
parent abd1c8df2f 3c40bf5bd1
commit b36d9fc9a9
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/qttest/tst_projectlock.cpp
+3 -1
View File
@@ -214,7 +214,9 @@ class tst_projectlock : public QObject
void readOnlyFolderDoesNotBlock()
{
#ifndef Q_OS_WIN
#ifdef Q_OS_WIN
QSKIP("a read-only folder still takes new files on Windows");
#else
if (geteuid() == 0)
QSKIP("root can write anywhere");
#endif
tests/qttest/tst_reporttextafterinfo.cpp
+6 -3
View File
@@ -69,10 +69,12 @@ private slots:
f.close();
// Columns numbered from 1, as QElectroTech's settings page
// shows by default
// shows by default. Written to an INI file QET_SETTINGS_DIR
// points at: on Windows the settings are in the registry
// otherwise, and the columns would count from 0
const QString home = m_dir.filePath(tag + QStringLiteral("-home"));
QVERIFY(QDir().mkpath(home + QStringLiteral("/config/QElectroTech")));
QFile conf(home + QStringLiteral("/config/QElectroTech/QElectroTech.conf"));
QVERIFY(QDir().mkpath(home + QStringLiteral("/settings/QElectroTech")));
QFile conf(home + QStringLiteral("/settings/QElectroTech/QElectroTech.ini"));
QVERIFY(conf.open(QIODevice::WriteOnly));
conf.write("[General]\nborder-columns_0=false\n");
conf.close();
@@ -80,6 +82,7 @@ private slots:
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
env.insert(QStringLiteral("QT_QPA_PLATFORM"), QStringLiteral("offscreen"));
env.insert(QStringLiteral("QET_ENABLE_SCRIPTING"), QStringLiteral("1"));
env.insert(QStringLiteral("QET_SETTINGS_DIR"), home + QStringLiteral("/settings"));
env.insert(QStringLiteral("HOME"), home);
env.insert(QStringLiteral("XDG_CONFIG_HOME"), home + QStringLiteral("/config"));
env.insert(QStringLiteral("XDG_DATA_HOME"), home + QStringLiteral("/data"));