0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: windows test compat

Browse Source 
fix: compiler warning on int qint32 compare

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers 2023-02-09 22:07:07 -08:00
parent cd2419137d
commit 3a0e4546c2
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
launcher/FileSystem.cpp
View File

@ -433,7 +433,7 @@ void create_link::runPrivlaged(const QString& offset)
in >> numResults;
qDebug() << "numResults" << numResults;
for(int i = 0; i < numResults; i++) {
for(quint32 i = 0; i < numResults; i++) {
FS::LinkResult result;
in >> result.src;
in >> result.dst;
@ -484,7 +484,6 @@ void ExternalLinkFileProcess::runLinkFile() {
#if defined Q_OS_WIN32
SHELLEXECUTEINFO ShExecInfo;
HRESULT hr;
fileLinkExe = fileLinkExe + ".exe";
@ -620,7 +619,7 @@ QString PathTruncate(const QString& path, int depth)
if (parts.startsWith(".") && !path.startsWith(".")) {
parts.removeFirst();
}
if (path.startsWith(QDir::separator())) {
if (QDir::toNativeSeparators(path).startsWith(QDir::separator())) {
parts.prepend("");
}

20
tests/FileSystem_test.cpp
View File

@ -1,4 +1,5 @@
#include <QTest>
#include <QDir>
#include <QTemporaryDir>
#include <QStandardPaths>
@ -769,14 +770,17 @@ slots:
}
void test_path_trunc() {
QCOMPARE(FS::PathTruncate("", 0), "");
QCOMPARE(FS::PathTruncate("foo.txt", 0), "");
QCOMPARE(FS::PathTruncate("foo.txt", 1), "");
QCOMPARE(FS::PathTruncate("./bar/foo.txt", 0), "./bar");
QCOMPARE(FS::PathTruncate("./bar/foo.txt", 1), "./bar");
QCOMPARE(FS::PathTruncate("/bar/foo.txt", 1), "/bar");
QCOMPARE(FS::PathTruncate("bar/foo.txt", 1), "bar");
QCOMPARE(FS::PathTruncate("baz/bar/foo.txt", 2), "baz/bar");
QCOMPARE(FS::PathTruncate("", 0), QDir::toNativeSeparators(""));
QCOMPARE(FS::PathTruncate("foo.txt", 0), QDir::toNativeSeparators(""));
QCOMPARE(FS::PathTruncate("foo.txt", 1), QDir::toNativeSeparators(""));
QCOMPARE(FS::PathTruncate("./bar/foo.txt", 0), QDir::toNativeSeparators("./bar"));
QCOMPARE(FS::PathTruncate("./bar/foo.txt", 1), QDir::toNativeSeparators("./bar"));
QCOMPARE(FS::PathTruncate("/bar/foo.txt", 1), QDir::toNativeSeparators("/bar"));
QCOMPARE(FS::PathTruncate("bar/foo.txt", 1), QDir::toNativeSeparators("bar"));
QCOMPARE(FS::PathTruncate("baz/bar/foo.txt", 2), QDir::toNativeSeparators("baz/bar"));
#if defined(Q_OS_WIN)
QCOMPARE(FS::PathTruncate("C:\\bar\\foo.txt", 1), QDir::toNativeSeparators("C:\\bar"));
#endif
}
};