| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
runonphone was dropping leading zeros after the decimal point in its
timestamp formating. For example [123.000456789] was printed as
[123.456789], which is quite a different number.
The formatting now pads the nanoseconds component with leading zeros to
9 characters. Timestamps are now always displayed with a 9 character
nanoseconds component, with leading and trailing zeros as appropriate.
For example:
[1897.070556640] [Qt Message] QEglContext::swapBuffers
Reviewed-by: Shane Kearns
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If runonphone is executed without specifying the debug agent, then
it will attempt to autodetect it by sending a CODA ping to the USB
port.
If there is a reply within 1 second, then CODA mode is used.
If not, then TRK mode is used.
TRK drops unrecognised messages, so the CODA ping is ignored and
initialisation starts normally when the TRK ping is sent.
Autodetect can be skipped by using the --coda or --trk arguments on
the command line to force use of a specific debug agent.
Reviewed-By: mread
|
|\ |
|
| |
| |
| |
| |
| | |
Merge-request: 2680
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 2670
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The actual devices are already detected in serenum_unix.cpp, but
when used with CODA, the eligible /dev entries apparently need
to be listed here, too.
Reviewed-By: Shane Kearns
Merge-Request: 1373
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The traceswitch application redirects debug messages to the USB
port. This was supported by the TRK backend but not by the CODA
backend.
1. CODA backend now recognises mux channel 2 as valid
2. new TextTraceHandler class to attach to channel 2 and decode
trace packets / print them to stdout
3. CODA signal handler creates a TextTraceHandler & destroys it
on shutdown
Reviewed-By: Miikka Heikkinen
|
| |
| |
| |
| |
| | |
Merge-request: 2670
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|/
|
|
|
| |
Merge-request: 1300
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
| |
This restores the option to upload files to arbritrary locations.
Reviewed-By: mread
|
|
|
|
|
|
|
|
|
| |
In some cases, the serial port is always completing with no error
and zero bytes read.
In this case, runonphone would not shut down properly as the
terminate file descriptor was never read.
Reviewed-By: mread
|
| |
|
| |
|
|
|
|
| |
Reviewed-By: Shane Kearns
|
|
|
|
|
|
|
| |
This allows uploading of any file to any directory on the phone.
Merge-request: 1271
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
| |
This helps automatic detection of devices such as N8-00, that don't
include Nokia in the product name (while devices from earlier
generations did include it, such as "Nokia 5800 XpressMusic").
Merge-request: 2633
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The change in 763f3acd879648648465475aef773fe0876934a9,
when merged in a315c693d0f3dd64711b8459d86b89ddc48e8c1a,
broke the usb device enumeration on OS X.
This commit makes it work again, but now we look for two
/dev entries per device (although only one of them exists).
If many usb devices are connected, this increases the risk
for false matches - if that ever happens, the
iteration/checking that was removed in
763f3acd879648648465475aef773fe0876934a9 could be readded
within the #ifdef Q_OS_MAC, making it add only one regexp
per device again.
Merge-request: 2633
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 2548
Signed-off-by: axis <qt-info@nokia.com>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| | |
The user needs to explicitly use -u or --upload to do that.
Task-number: QTBUG-16625
Merge-request: 2548
Signed-off-by: axis <qt-info@nokia.com>
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/s60main/newallocator_hook.cpp
tools/runonphone/serenum_unix.cpp
|
| |
| |
| |
| |
| | |
Merge-request: 834
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Tested on OS X Snow Leopard with libusb-0.1.12.
The devices are named /dev/cu.usbmodem<opaque id><interface number>,
where the opaque id doesn't seem to be available via the current
libusb interface, but finding it would require usage of native OS X APIs.
The interface number is available at least, and searching for
cu\.usbmodem.*<interface number> as a regexp finds the right devices as
long as not too many devices are connected.
Merge-request: 834
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
| |
| |
| |
| |
| |
| |
| | |
In some occasions (encountered on OS X), this can be null for some devices.
Merge-request: 834
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Cleaned up some unnecessary code in the serenum_unix file.
Add the device only once to the list used for printing info about
devices with no serial drivers.
Add each ACM interface ID, trusting the numbers given in the master
interface. The existing code of searching for the slave interface
would have been appropriate for a user-mode device driver, but we only
need the interface numbers as we are going to use existing device drivers
via the tty devices
Reviewed-By: axis
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Linux cdc-acm driver detects the debug port on some Nokia phones automatically
When it does, it creates two ttyACMx devices and the symlink in
/dev/serial/by-id contains the CDC master interface number.
In contrast the generic usbserial driver creates a symlink containing the
CDC slave interface number. This is because it knows nothing about CDC
and is just looking for BULK IN/OUT interfaces that might be serial ports.
This change creates match strings for both the master and slave interfaces,
so the phone is detected if either driver is loaded.
Reviewed-By: axis
|
| |
|
|
|
|
|
|
|
|
|
| |
Make it build:
- fixing missing prototype declaration
- explicit inclusion header file
Merge-request: 813
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
| |
RevBy: Trust me
|
|
|
|
| |
RevBy: Trust me
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| | |
|