summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Adam <cristian.adam@qt.io>2023-10-12 16:52:33 +0200
committerCristian Adam <cristian.adam@qt.io>2023-10-12 17:35:02 +0000
commitca9077a4ae9d301383fc2f3021eadfede5d48804 (patch)
tree57ba26b64ccf70cfeb27b49335b5ea606b1371ac
parentbe86a8ea6b7671c7a60abc6e51db27ace7baedb9 (diff)
Fix MSVC testHEADmaster13.0
The test fails on Windows due to the attempt to replace /usr/ with \usr\ and tst_finddebugsym.cpp fails. FAIL! : TestFindDebugSymbols::findDebugSymbols(/usr/lib/debug) Compared values are not the same Actual (debugFile.absoluteFilePath()) : "C:/Users/runneradmin/AppData/Local/Temp/tst_finddebugsym-TlBRCb/usr/lib/x64/libc.so/libc.so" Expected (QFileInfo(tempDir.path() + debugLinkString).absoluteFilePath()): "C:/Users/runneradmin/AppData/Local/Temp/tst_finddebugsym-TlBRCb/usr/lib/debug/lib/x64/libc.so" Change-Id: I839be2a74eb3044b0d81f0633c0038f7a1b58a09 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r--app/perfsymboltable.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/perfsymboltable.cpp b/app/perfsymboltable.cpp
index f3397b0..e5e7bbb 100644
--- a/app/perfsymboltable.cpp
+++ b/app/perfsymboltable.cpp
@@ -366,7 +366,7 @@ QFileInfo PerfSymbolTable::findDebugInfoFile(
// try again in /usr/lib/debug folder
// some distros use for example /usr/lib/debug/lib (ubuntu) and some use /usr/lib/debug/usr/lib (fedora)
- const auto usr = QString(QDir::separator() + QLatin1String("usr") + QDir::separator());
+ const auto usr = QFileInfo(QDir::separator() + QLatin1String("usr") + QDir::separator()).path();
auto folderWithoutUsr = folder;
folderWithoutUsr.replace(usr, QDir::separator());