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

wasm: Fix resource crash between qfile and qfileinfo

Browse Source 
The prefix should be tst_qfile

Change-Id: I1944e7c37711c626ad8bd5f5df3a597494f4bc14
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
This commit is contained in:
Even Oscar Andersen 2024-08-09 16:04:24 +02:00
parent abf17c2965
commit 36b0816b81
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/io/qfile/CMakeLists.txt
View File

@ -38,7 +38,7 @@ set(qfile_resource_files
qt_internal_add_resource(tst_qfile "qfile"
PREFIX
"/tst_qfileinfo/"
"/tst_qfile/"
FILES
${qfile_resource_files}
)

10
tests/auto/corelib/io/qfile/tst_qfile.cpp
View File

@ -1396,9 +1396,9 @@ void tst_QFile::permissions_data()
"longFileNamelongFileNamelongFileNamelongFileName"
"longFileNamelongFileNamelongFileNamelongFileName"
"longFileNamelongFileNamelongFileNamelongFileName.txt") << uint(QFile::ReadUser) << true << true;
QTest::newRow("resource1") << ":/tst_qfileinfo/resources/file1.ext1" << uint(QFile::ReadUser) << true << false;
QTest::newRow("resource2") << ":/tst_qfileinfo/resources/file1.ext1" << uint(QFile::WriteUser) << false << false;
QTest::newRow("resource3") << ":/tst_qfileinfo/resources/file1.ext1" << uint(QFile::ExeUser) << false << false;
QTest::newRow("resource1") << ":/tst_qfile/resources/file1.ext1" << uint(QFile::ReadUser) << true << false;
QTest::newRow("resource2") << ":/tst_qfile/resources/file1.ext1" << uint(QFile::WriteUser) << false << false;
QTest::newRow("resource3") << ":/tst_qfile/resources/file1.ext1" << uint(QFile::ExeUser) << false << false;
}
void tst_QFile::permissions()
@ -3466,8 +3466,8 @@ void tst_QFile::mapResource_data()
QTest::addColumn<QFile::FileError>("error");
QTest::addColumn<QString>("fileName");
QString validFile = ":/tst_qfileinfo/resources/file1.ext1";
QString invalidFile = ":/tst_qfileinfo/resources/filefoo.ext1";
QString validFile = ":/tst_qfile/resources/file1.ext1";
QString invalidFile = ":/tst_qfile/resources/filefoo.ext1";
const char modes[] = "invalid";
for (int i = 0; i < 2; ++i) {