diff options
| author | Martin Storsjo <martin@martin.st> | 2011-09-07 17:52:38 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-09-07 17:52:38 (GMT) |
| commit | d763cfb2eb118573115e35bdd3831fc8c8c18dc4 (patch) | |
| tree | c7cfd8ef71932224ae65666d7bf88ed8883da7bf /tools | |
| parent | 79419570ae9f9f21779b308ebcfd4f3479d7f28b (diff) | |
| download | Qt-d763cfb2eb118573115e35bdd3831fc8c8c18dc4.zip Qt-d763cfb2eb118573115e35bdd3831fc8c8c18dc4.tar.gz Qt-d763cfb2eb118573115e35bdd3831fc8c8c18dc4.tar.bz2 | |
runonphone: Allow overriding the temporary sis file name
Merge-request: 1300
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/runonphone/main.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/runonphone/main.cpp b/tools/runonphone/main.cpp index af349eb..39fa983 100644 --- a/tools/runonphone/main.cpp +++ b/tools/runonphone/main.cpp @@ -67,6 +67,7 @@ void printUsage(QTextStream& outstream, QString exeName) << "-q, --quiet hide progress messages" << endl << "-u, --upload <local file> <remote file> upload file to phone" << endl << "-d, --download <remote file> <local file> copy file from phone to PC after running test" << endl + << "-T, --tempfile <remote file> specify temporary sis file name" << endl << "--nocrashlog Don't capture call stack if test crashes" << endl << "--crashlogpath <dir> Path to save crash logs (default=working dir)" << endl << "--coda Use CODA instead of TRK (default agent)" << endl @@ -94,6 +95,7 @@ int main(int argc, char *argv[]) QString uploadRemoteFile; QString downloadRemoteFile; QString downloadLocalFile; + QString dstName = "c:\\data\\testtemp.sis"; int loglevel=1; int timeout=0; bool crashlog = true; @@ -153,6 +155,10 @@ int main(int argc, char *argv[]) } else if (arg == "--coda") coda = true; + else if (arg == "--tempfile" || arg == "-T") { + CHECK_PARAMETER_EXISTS + dstName = it.next(); + } else if (arg == "--verbose" || arg == "-v") loglevel=2; else if (arg == "--quiet" || arg == "-q") @@ -225,7 +231,6 @@ int main(int argc, char *argv[]) if (!sisFile.isEmpty()) { codaHandler.setActionType(ActionCopyInstall); - QString dstName = "c:\\data\\testtemp.sis"; codaHandler.setCopyFileName(sisFile, dstName); } else if (!uploadLocalFile.isEmpty() && uploadInfo.exists()) { @@ -257,7 +262,6 @@ int main(int argc, char *argv[]) if (!sisFile.isEmpty()) { launcher->addStartupActions(trk::Launcher::ActionCopyInstall); srcNames.append(sisFile); - QLatin1String dstName("c:\\data\\testtemp.sis"); dstNames.append(dstName); launcher->setInstallFileNames(QStringList(dstName)); } |