From 914f978da2704320ef6eec9cf30e471e20ca04f8 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 7 Mar 2014 09:59:49 +0100 Subject: [PATCH] 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 --- tests/auto/debugger/tst_dumpers.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 5e5cabb2a8e..049f8a07890 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 " : "\n#include ") + - "\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;