summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2010-05-06 13:02:59 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2010-05-06 13:06:32 (GMT)
commitfff6751d0ae61837f08874bce5ad04c4b9536894 (patch)
treea4b665d693879f886004c95cdae6f2f42a78fd89
parent250f7a34d3b1e6b946f2bfc7ce69c135e426b204 (diff)
downloadQt-fff6751d0ae61837f08874bce5ad04c4b9536894.zip
Qt-fff6751d0ae61837f08874bce5ad04c4b9536894.tar.gz
Qt-fff6751d0ae61837f08874bce5ad04c4b9536894.tar.bz2
Check for existance of sis file parameter to runonphone
Previously, it would skip over a non existant sis file - which could cause invalid test results if a previous version of the sis was already installed. Now, it checks if the file exists and exits with an error message if asked to install a sis file that doesn't exist. Task-number: QTBUG-9290 Reviewed-by: Miikka Heikkinen
-rw-r--r--tools/runonphone/main.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/runonphone/main.cpp b/tools/runonphone/main.cpp
index 37e4548..885d029 100644
--- a/tools/runonphone/main.cpp
+++ b/tools/runonphone/main.cpp
@@ -102,6 +102,10 @@ int main(int argc, char *argv[])
else if (arg == "--sis" || arg == "-s") {
CHECK_PARAMETER_EXISTS
sisFile = it.next();
+ if (!QFileInfo(sisFile).exists()) {
+ errstream << "Sis file (" << sisFile << ") doesn't exist" << endl;
+ return 1;
+ }
}
else if (arg == "--download" || arg == "-d") {
CHECK_PARAMETER_EXISTS