diff options
| author | David Schulz <david.schulz@digia.com> | 2014-03-07 09:59:49 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@digia.com> | 2014-03-07 10:22:18 +0100 |
| commit | 914f978da2704320ef6eec9cf30e471e20ca04f8 (patch) | |
| tree | 1195c4a52f780e54585a2337ee9d5051d1ec8ac1 /tests/auto/debugger | |
| parent | 73ec0c5db4f2aa2d084b8ecc8d63656371e8e23a (diff) | |
| download | qt-creator-914f978da2704320ef6eec9cf30e471e20ca04f8.tar.gz | |
Debugger: Fix dumper test when inferior runs under wow64.
When the inferior runs under wow64, DebugBreak throws a wow64 breakpoint.
These has to be ignored because they are also thrown on every 32 bit library
load. To make sure the debugger breaks DebugBreak is replaced by a null
pointer dereference.
Change-Id: I0c0985558da1c355c1fc62a2fc5f736e54e843ce
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'tests/auto/debugger')
| -rw-r--r-- | tests/auto/debugger/tst_dumpers.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 5e5cabb2a8..049f8a0789 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -974,7 +974,7 @@ void tst_Dumpers::dumper() "\n\n#if defined(_MSC_VER)" + (data.useQt ? "\n#include <qt_windows.h>" : "\n#include <Windows.h>") + - "\n#define BREAK do { DebugBreak(); } while (0)" + "\n#define BREAK int *nullPtr = 0; *nullPtr = 0;" "\n#else" "\n#define BREAK do { asm(\"int $3\"); } while (0)" "\n#endif" @@ -1098,7 +1098,6 @@ void tst_Dumpers::dumper() "l+s\n" "sxi 0x4000001f\n" "g\n" - "gu\n" "!qtcreatorcdbext.expandlocals -t 0 -c 0 " + expanded + "\n"; int token = 0; QStringList sortediNames; |