| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
Trap SIGINT, SIGTERM, SIGHUP, SIGBREAK, SIGQUIT
On receiving one of these signals, we first untrap them (so runonphone
can be killed by a 2nd ctrl-c if needed), and send a terminate to the
TRK launcher.
This will kill the remote process if it's running, then disconnect from
TRK cleanly.
Task-number: QTBUG-12444
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
|
|
|
| |
When a thread panics, calling resume allows the thread to proceed to the
exit handler and shut down.
When a thread takes an exception, calling resume continues from the same
point so the exception happens again.
To avoid this, we add crashed thread ids to a list. If we see the same
thread crash again, we terminate the process without trying to fetch the
call stack a second time.
Reviewed-by: Jason Barron
|
|
|
|
|
|
|
|
|
|
| |
The linux usbserial driver doesn't attach to devices automatically, to avoid conflicts
with the real driver (if there is one). So the user must run modprobe to load the
driver before runonphone can be used.
Since runonphone has found the correct device(s) using libusb, this patch will tell the
user the modprobe command that is required to load the generic usbserial driver.
Reviewed-By: Gareth Stockwell
|
|
|
|
|
|
|
|
|
|
|
| |
The interface numbers in /dev/serial/by-id are hex rather than decimal.
Also added code to read the manufacturer name and product name from string descriptors
in order to get a better match. Unfortunately, root privilege is needed or the API
returns an error.
In this case, we still use the weak matching on interface number only.
Task-Number: QTBUG-11794
Reviewed-By: Thomas Zander
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When the test being run crashes, runonphone will now retrieve the
registers and call stack for the crashing thread from the phone and save
to a crash log (compatible with d_exc crash logs, so existing tools can
be used to analyse the log)
To disable just in time debug, use --nocrashlog on the command line
To save the crash logs to a different location, use --crashlogpath <path>
otherwise, they are saved to the working directory.
To convert the crash logs into human readable form, use the crash
analyser carbide plugin from symbian foundation; or another symbian tool
that can process d_exc style logs.
Reviewed-by: Thomas Zander
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
commit bca434a706c6eb28fe713ea10c857c35e3835f62
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed Jul 7 14:00:54 2010 +0200
Trk/Launcher: Add infrastructure for reporting crashes.
currently used for runonphone only.
Initial-patch-by: Shane Kearns <shane.kearns@accenture.com>
commit 9bb67101c5daa42f879f2fcf884277c5fd23bed4
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon Jul 5 17:14:45 2010 +0200
Trk[TCF]: Proper exit handling
commit 52b33a7503866654077b572c1f8005dfc19ed5a6
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed Jun 30 17:14:57 2010 +0200
Debugger[Trk]: Prepare thread handling.
Store threads and cache registers per thread in Snapshot.
As Trk does not generate Thread creation/deletion events.
try to add threads on the fly if a stop in a new thread id is reported.
Remove them in continue. Continue all threads in classic Trk.
Pass on state (crash reason) to ThreadData and model.
Factor out common code of both adapters to Snapshot/Symbian classes.
commit 66e01e881d7cb865338a6a7949f9a085883387c9
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon Jun 28 16:32:53 2010 +0200
Debugger[TCF-Trk]: Send RemoveExecutables command.
commit beba423a16fd0e6e836cd8c26ca30e5167ca56db
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri Jun 25 15:06:30 2010 +0200
Debugger[Trk]: Added TCF experimental adapter.
Added adapter to work with TCF over WLAN.
Factor out common code for Symbian from TrkAdapter.
Improve message logging in TrkGdbAdapter, some cleanup.
Added new TcfTrkGdbAdapter based on TcfTrkDevice
in symbianutils based on JSON, using QTcpSocket.
To be started via special @tcf@ argument.
Rubber-stamped-by: hjk
create mode 100644 src/shared/symbianutils/json.cpp
create mode 100644 src/shared/symbianutils/json.h
create mode 100644 src/shared/symbianutils/tcftrkdevice.cpp
create mode 100644 src/shared/symbianutils/tcftrkdevice.h
create mode 100644 src/shared/symbianutils/tcftrkmessage.cpp
create mode 100644 src/shared/symbianutils/tcftrkmessage.h
commit 5d5f647f3d9b7a28c605af41a23819b7a24a5814
Author: Tobias Hunger <tobias.hunger@nokia.com>
Date: Thu Jun 10 13:12:12 2010 +0200
Fix preprocessor directives
* The standard says all preprocessor directives have to start at column 0.
commit 6972715a397e8e9a495191a459dcf6db4b75f7a7
Author: Robert Loehning <robert.loehning@nokia.com>
Date: Mon Jun 7 14:58:24 2010 +0200
Symbian/trk: Fixed handling of partial frames
Initial-patch-by: Shane Kearns <shane.kearns@accenture.com>
commit a47e06eec946dd2dbb986e614a3c292b91182b95
Author: Robert Loehning <robert.loehning@nokia.com>
Date: Mon Jun 7 14:47:40 2010 +0200
Symbian/trk: Don't try to dereference references
commit b6ee94fb5ff652ba22b272a064c2be541b4bcf56
Author: Robert Loehning <robert.loehning@nokia.com>
Date: Mon Jun 7 11:50:38 2010 +0200
Symbian/Trk: Don't try to download a file without respective flag set.
Task-number: QTCREATORBUG-1567
Reviewed-by: Friedemann Kleint
|
|
|
|
|
|
|
|
|
| |
1. Fix hanging behaviour when we receive a message on the wrong mux in
framed mode
2. Treat messages on the trace mux (0102) as debug output
3. Separate timestamp from text in trace messages
Reviewed-by: Friedemann Kleint
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
runonphone --download <remote file> <local file>
Can be used to copy files from the phone to the PC.
Typical use would be to get a test log, for example:
runonphone -s tst_qdir.sis -d c:\data\log.txt c:\temp\log.txt
tst_qdir.exe -o c:\temp\log.txt
Reviewed-by: Thomas Zander
|
|
|
|
|
|
|
|
|
|
|
| |
Use the TRK protocol to copy a file from the phone to PC after
running the executable.
This can be used for example to download a log file containing test
results.
Submitted upstream as commit 9b65c244d7027d78f0b40450961eab68680d6269.
Reviewed-by: Friedemann Kleint
|
| |
|
|
|
|
|
|
|
|
|
|
| |
"runonphone --sis qt.sis"
Would install qt to the phone without attempting to execute any test
afterwards.
This feature is added because people were using runonphone as a fast
way to install sis files from the command shell.
Reviewed-by: axis
|
|
|
|
|
|
|
| |
This change is to avoid flooding the console when copying a large sis
file (e.g. qt.sis) to the phone.
Reviewed-by: axis
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
mkspecs/common/symbian/symbian.conf
src/gui/graphicsview/qgraphicswidget.h
src/gui/kernel/qapplication.cpp
src/gui/text/qtextlayout.cpp
src/openvg/qpixmapdata_vg.cpp
src/s60installs/s60installs.pro
tools/runonphone/main.cpp
tools/runonphone/serenum_unix.cpp
qtextlayout.cpp fixed up together with Eskil.
Kept the configure.exe from 4.7 without recompile.
|
| | |
|
| |
| |
| |
| | |
RevBy: Shane Kearns
|
| | |
|
|/ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
commit 3efdb87682a5785bac7b90f9f9a8bb819a1cb053
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon Feb 8 14:10:51 2010 +0100
S60/Trk: Make the port a property of TrkDevice.
Associate the port with the device instead of passing it to open
for better handling.
commit 76872c6ed8a1477f1914266d6917ee4aad6ff7e9
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri Feb 5 17:34:02 2010 +0100
S60: Move serialdevicelister.cpp to symbianutils/symbiandevicemanager.cpp
|
|
|
|
|
|
|
|
| |
commit 9c2676167a3aaeb99024a22343c3d998f191a75f
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri Feb 5 12:32:32 2010 +0100
src/shared: Rename trk to symbianutils
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is the last SHA before trk directory is renamed.
Note the \\.\ is prepended to windows com ports inside the library now,
so main.cpp no longer has this windows specific code.
commit f2b3e9f2dfbc580389b9b683a3e46e5a8422f55b
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri Feb 5 12:24:46 2010 +0100
S60/Trk: Change trkutils to be a library of its own.
To be able to share TrkDevices between Debugger and Qt4ProjectManager.
commit 61c3a260b59433abf8c3ef481ec536af88f8026c
Author: Sarika Kamisetty <sarikak11@gmail.com>
Date: Thu Feb 4 09:57:54 2010 +0100
Fix to App TRK connection with 'high COM port' does not work
Merge-request: 111
Reviewed-by: hjk <qtc-committer@nokia.com>
commit 2fd8b2d7ffa2ac032bfe3a17efe7d152c4cef14d
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon Feb 1 12:43:56 2010 +0100
Fix some code scanning issues.
QString: Use QChar where appropriate.
commit 805b0a9cc165ef6cd596bd8f5e59f650cd0eebb2
Author: hjk <qtc-committer@nokia.com>
Date: Mon Feb 1 11:45:44 2010 +0100
debugger: trk log output cosmetic
commit 75b42f18d886b59dbf3380dd12f39f40005ef08b
Merge: 4320314 a6ca348
Author: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri Jan 29 22:49:55 2010 +0100
Merge remote branch 'origin/1.3'
Trailing whitespace removal re-applied manually.
commit a6ca348636dd92ab1445cff2286b3293163f5cea
Author: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri Jan 29 21:33:57 2010 +0100
remove trailing whitespace
doing it in 1.3 as well to avoid possible later conflicts
commit 4ec51219ed5c2150e164473b9c5326b6c68d096a
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu Jan 28 17:04:05 2010 +0100
Trk: Fix source code scanning tool issues.
showing up in Qt.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The patch accepted upstream has the signal and slot renamed, so there
is a corresponding change to main.cpp
commit 53c672fb9853fef5a00285213084f02a4253e5f3
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu Jan 21 15:45:40 2010 +0100
trk: Handle TrkNotifyStopped in launcher.
Add signal and static utility functions to parse message.
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
Initial-patch-by: Shane Kearns <shane.kearns@sosco.com>
Task-number: QTBUG-7444
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The patch accepted upstream changed a parameter from QString to
QStringList. So there is a corresponding change to main.cpp to use the
new API.
commit b1291ecfd0ab31c41783feb645c98ce42fa87aae
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu Jan 21 12:33:34 2010 +0100
trk: Add support for command line arguments in trk::Launcher.
Initial-patch-by: Shane Kearns <shane.kearns@sosco.com>
Task-number: QTBUG-7444
|
|
|
|
| |
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
commit 1b77161e7183cdd4b5493698b4cddc727468f0f5
Author: hjk <qtc-committer@nokia.com>
Date: Fri Jan 15 12:01:26 2010 +0100
debugger: clean up verbosity settings in trk adapter
commit 4d7341becac684f5feb908e45d8b1756b4823c20
Author: hjk <qtc-committer@nokia.com>
Date: Wed Jan 13 14:48:29 2010 +0100
debugger: whitespace
commit d3cdfe813444b6afca483c7d13ac80c4c8eda62b
Author: hjk <qtc-committer@nokia.com>
Date: Wed Jan 13 14:46:13 2010 +0100
debugger: add some debug output to trk device
commit 7cd27f2eecd5f77bc35f6b705c6f0422b09e534d
Author: hjk <qtc-committer@nokia.com>
Date: Mon Jan 4 13:17:38 2010 +0100
debugger: add list of thread ids to TRK session state object
Reviewed-by: Shane Kearns
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Enumerate the ACM ports which are created in /dev after plugging in the
phone.
Tested on Kubuntu (karmic koala), using 5800XM and N95.
Linux has two USB drivers of interest.
1: CDC-ACM, this loads automatically, and creates /dev/ttyACM<n> for
the USB modem interface
2: USBSERIAL, this needs to be loaded manually using modprobe, and
creates /dev/ttyUSB<n> for each ACM interface on the phone
The second ttyUSB port is the one we need, this enumerator does not
pick the correct port yet. (1st port is ECACM:0, i.e. the modem, 2nd
port is ECACM:1, i.e. the general purpose port used by TRK)
according to lsusb, the 1st ACM descriptor has:
class 2 (comms)
subclass 2 (abstract - modem)
protocol 1 (AT commands)
2nd ACM descriptor has:
class 2 (comms)
subclass 2 (abstract - modem)
protocol 255 (vendor specific)
Linux 2.6.33 RC3 has a hardcoded list of nokia phones in cdc-acm.c for which
the protocol 255 ACM port will be recognised as a second ttyACM
Task-number: QTBUG-7446
Reviewed-by: Miikka Heikkinen
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits)
Reverted two commits that were pushed to the wrong branch.
Use the new QTextCodec api in the QXmlStreamWriter.
Added new functions to QTextCodec that accept ConversionFlags.
Fix passing of arguments to syncqt
doc: Fixed typos.
Fixes: Fix spinbox with NoButton style in QGtkStyle
doc: Explained parameter value defaults where appropriate.
Cocoa: Fix painting errors on QGLWidget resizing.
Fix broken QGLWidget::renderPixmap on Mac/Carbon
Fixes: Setting any style sheet breaks checkbox positioning
Fixes: MenuItem size fixes and missing separator with Gtk+
Autotest: add a test for QNAM's HTTP cache handling code
QNAM HTTP: just use the expirationDate in the code that validates the cache
QNAM HTTP: change the caching semantics to match documentation
QNAM HTTP: fix the caching algorithm from RFC 2616
Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner
improve readability a bit more
fix styling; improve readability
make it possible to retrieve name of the user who owns the file
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )
...
|
| |\ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| | |
Removed the alternate implementation of the registry reading, although
the new API is simpler, the old XP method is not deprecated.
Added an extra library that is needed according to API documentation,
but is omittable on MinGW.
Also gave a better error message when serial port detection fails.
Reviewed-by: Miikka Heikkinen
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added an optional timeout to runonphone - the application will be killed
after this time. Used when autotesting unattended, as some tests can hang.
Handled the just in time debug halting the application when it is about
to crash, by terminating the application. In future, we could capture a
call stack or something here.
Also added quiet/verbose options to control the amount of output from
runonphone.
Reviewed-by: Janne Koskinen
|
|
|
|
|
| |
AutoTest: Passed
RevBy: Paul Olav Tvete
|
|
The tool uses TRK to launch the application.
TRK is a debug agent, available as a signed package for consumer phones.
For Nokia phones, it is distributed with carbide; for other manufacturers
it can be downloaded from their developer websites.
The launcher code is reused from Qt creator, with a patch to allow us
to pass command line arguments to the process being launched.
The "make run" target is enhanced to support running on target as well as
the emulator. Like the "make sis" target, the last platform to have been
built is the one that will be launched.
The runonphone tool needs to be built in a Qt environment configured for
windows, and requires at least windows XP (Symbian development requires
windows XP SP2). Current proposal is to include a statically linked exe
in the bin directory for binary packages.
Reviewed-by: Janne Koskinen
|