diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-03-12 10:01:03 +1000 |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-03-12 10:01:03 +1000 |
commit | 678da35a689dbafaf2ccf6ef9afc8a930a8000c0 (patch) | |
tree | 444eeb56499b47c0613241ba63e50c97ecffaa9d /benchmarks | |
parent | ce5e2aa9b6a2261ed4b7ec0492d1fdc9f30c0cc3 (diff) |
Fixes: test failure: Could not delete /foo/bar/.qmf
Diffstat (limited to 'benchmarks')
-rw-r--r-- | benchmarks/tst_messageserver/tst_messageserver.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/benchmarks/tst_messageserver/tst_messageserver.cpp b/benchmarks/tst_messageserver/tst_messageserver.cpp index 1fda5741..16e646cd 100644 --- a/benchmarks/tst_messageserver/tst_messageserver.cpp +++ b/benchmarks/tst_messageserver/tst_messageserver.cpp @@ -128,16 +128,19 @@ void tst_MessageServer::removePath(QString const& path) } QDir parent = fi.dir(); + QString filename = fi.fileName(); - bool ok; - if (fi.isDir() && !fi.isSymLink()) { - ok = parent.rmdir(fi.fileName()); - } - else { - ok = parent.remove(fi.fileName()); - } - if (!ok) { - qFatal("Could not delete %s", qPrintable(path)); + if (!filename.isEmpty()) { + bool ok; + if (fi.isDir() && !fi.isSymLink()) { + ok = parent.rmdir(fileName); + } + else { + ok = parent.remove(fileName); + } + if (!ok) { + qFatal("Could not delete %s", qPrintable(path)); + } } } |