diff options
| author | David Schulz <david.schulz@qt.io> | 2017-04-24 10:07:13 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2017-04-24 08:42:50 +0000 |
| commit | 41954de06e220d012ef22b00daa5ea37bae876dd (patch) | |
| tree | bc39281b6b8dbce9bd0cd1d7a69c913f025b5ef2 /tests | |
| parent | 8793d0f0fa400a7eef10f2c71c276f470aafe4b4 (diff) | |
| download | qt-creator-41954de06e220d012ef22b00daa5ea37bae876dd.tar.gz | |
Debugger: Fix dumper tests in wow64 env
Change-Id: Iac874ccb0c498065e1f46ebcc66a48ef721f6fff
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/debugger/tst_dumpers.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index e0b3e02329..0933666f23 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -1282,7 +1282,8 @@ void tst_Dumpers::dumper() "\n\n#if defined(_MSC_VER)" + (data.useQt ? "\n#include <qt_windows.h>" : "\n#define NOMINMAX\n#include <Windows.h>") + - "\n#define BREAK [](){ DebugBreak(); }();" + "\nvoid qtcDebugBreakFunction() { return; }" + "\n#define BREAK qtcDebugBreakFunction();" "\n\nvoid unused(const void *first,...) { (void) first; }" "\n#else" "\n#include <stdint.h>\n"; @@ -1473,20 +1474,18 @@ void tst_Dumpers::dumper() cmds += "quit\n"; } else if (m_debuggerEngine == CdbEngine) { - QString cdbextPath = m_env.value("_NT_DEBUGGER_EXTENSION_PATH"); - const int frameNumber = cdbextPath.contains("qtcreatorcdbext64") ? 2 : 1; args << QLatin1String("-aqtcreatorcdbext.dll") << QLatin1String("-G") - << QLatin1String("-xi") + << QLatin1String("-xn") << QLatin1String("0x4000001f") << QLatin1String("-c") - << QLatin1String("g") + << QLatin1String("bm doit!qtcDebugBreakFunction;g") << QLatin1String("debug\\doit.exe"); cmds += "!qtcreatorcdbext.script sys.path.insert(1, '" + dumperDir + "')\n" "!qtcreatorcdbext.script from cdbbridge import *\n" "!qtcreatorcdbext.script theDumper = Dumper()\n" "!qtcreatorcdbext.script theDumper.setupDumpers()\n" - ".frame " + QString::number(frameNumber) + "\n" + ".frame 1\n" "!qtcreatorcdbext.pid\n" "!qtcreatorcdbext.script -t 42 theDumper.fetchVariables({" "'token':2,'fancy':1,'forcens':1," |