1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_qdir: don't use the source dir for testing

Browse Source 
Copy test dirs from the source dir to a QTemporaryDir,
this way each run starts with a clean slate.

Also on some setups the source dir could be read-only.

Task-number: QTBUG-117449
Change-Id: Iea5fd661b66dd3cbae0b663bb504b14c8ccbe491
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ahmad Samir 2024-03-17 12:51:38 +02:00
parent 14ec2ab89f
commit b3e9e80719
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/auto/corelib/io/qdir/tst_qdir.cpp
View File

@ -207,12 +207,18 @@ private slots:
void stdfilesystem(); void stdfilesystem();
private: private:
#ifdef BUILTIN_TESTDATA
QString m_dataPath;
QSharedPointer<QTemporaryDir> m_dataDir; QSharedPointer<QTemporaryDir> m_dataDir;
#else QString m_dataPath;
const QString m_dataPath;
#endif constexpr static const std::array m_testDirs = {
"entrylist"_L1,
"resources"_L1,
"searchdir"_L1,
"testData"_L1,
"testdir"_L1,
"types"_L1,
"tst_qdir.cpp"_L1,
};
}; };
Q_DECLARE_METATYPE(tst_QDir::UncHandling) Q_DECLARE_METATYPE(tst_QDir::UncHandling)
@ -260,6 +266,20 @@ void tst_QDir::initTestCase()
m_dataDir = QEXTRACTTESTDATA("/"); m_dataDir = QEXTRACTTESTDATA("/");
QVERIFY2(!m_dataDir.isNull(), qPrintable("Did not find testdata. Is this builtin?")); QVERIFY2(!m_dataDir.isNull(), qPrintable("Did not find testdata. Is this builtin?"));
m_dataPath = m_dataDir->path(); m_dataPath = m_dataDir->path();
#elif QT_CONFIG(cxx17_filesystem) // This code doesn't work in QNX on the CI
m_dataDir.reset(new QTemporaryDir);
m_dataPath = m_dataDir->path();
QString sourceDir = QFileInfo(QFINDTESTDATA(m_testDirs[0])).absolutePath();
namespace fs = std::filesystem;
for (const auto &entry : m_testDirs) {
auto l1 = QLatin1StringView(entry);
const auto src = fs::path(QString(sourceDir + u'/' + l1).toStdString());
const auto dest = fs::path(QString(m_dataPath + u'/' + l1).toStdString());
std::error_code ec;
fs::copy(src, dest, fs::copy_options::recursive, ec);
QCOMPARE(ec.value(), 0);
}
#endif #endif
QVERIFY2(!m_dataPath.isEmpty(), "test data not found"); QVERIFY2(!m_dataPath.isEmpty(), "test data not found");