diff options
| author | hjk <hjk121@nokiamail.com> | 2013-09-11 21:35:39 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2013-09-19 12:09:52 +0200 |
| commit | 7971b6e71405d50189b697bf071734a18102f1a4 (patch) | |
| tree | 22d9369d3583796258a85eb746a58b4ff1ba7a76 /tests | |
| parent | a60a3b43a7eaa74bc841a4146fc3cc5d75d2908f (diff) | |
| download | qt-creator-7971b6e71405d50189b697bf071734a18102f1a4.tar.gz | |
Debugger: Make dumpers a bit more Python 3.x friendly
Looks like Ubuntu 13.10 will ship GDB linked to Python 3.3.
Change-Id: I748e8461531a3554d27ebfbf7af33385f69586c0
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/debugger/tst_dumpers.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 43a2743822..1b2458d669 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -836,7 +836,8 @@ void tst_Dumpers::dumper() "set auto-load python-scripts no\n"; if (m_usePython) { - cmds += "python execfile('" + dumperDir + "/gbridge.py')\n" + cmds += "python sys.path.insert(1, '" + dumperDir + "')\n" + "python from gbridge import *\n" "run " + nograb + "\n" "up\n" "python print('@%sS@%s@' % ('N', qtNamespace()))\n" @@ -3401,7 +3402,7 @@ void tst_Dumpers::dumper_data() % Profile("QT += network\n") % Check("ha", "\"127.0.0.1\"", "@QHostAddress") % Check("ha.a", "0", "@quint32") - % Check("ha.a6", "", "@Q_IPV6ADDR") + % Check("ha.a6", "0:0:0:0:0:0:0:0", "@Q_IPV6ADDR") % Check("ha.ipString", "\"127.0.0.1\"", "@QString") % Check("ha.isParsed", "false", "bool") % Check("ha.protocol", "@QAbstractSocket::UnknownNetworkLayerProtocol (-1)", @@ -3409,7 +3410,7 @@ void tst_Dumpers::dumper_data() % Check("ha.scopeId", "\"\"", "@QString") % Check("ha1", "\"127.0.0.1\"", "@QHostAddress") % Check("ha1.a", "0", "@quint32") - % Check("ha1.a6", "", "@Q_IPV6ADDR") + % Check("ha1.a6", "0:0:0:0:0:0:0:0", "@Q_IPV6ADDR") % Check("ha1.ipString", "\"127.0.0.1\"", "@QString") % Check("ha1.isParsed", "false", "bool") % Check("ha1.protocol", "@QAbstractSocket::UnknownNetworkLayerProtocol (-1)", |