From 0b6b5631b76011a3858979b1d10a91c00ebdebfd Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 19 Mar 2015 07:35:18 +0100 Subject: [PATCH] Tests: Dumper: Fix QByteArray dumper test for cdb. Change-Id: Ic5cdf0092d720bc13c1609b6e489e48712645f8b Reviewed-by: Christian Stenger --- tests/auto/debugger/tst_dumpers.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 22710817cd9..6117c31b28f 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -1257,8 +1257,11 @@ void tst_Dumpers::dumper() << QLatin1String("-c") << QLatin1String("g") << QLatin1String("debug\\doit.exe"); + cmds = "!qtcreatorcdbext.setparameter maxStringLength=100"; if (data.bigArray) - cmds = "!qtcreatorcdbext.setparameter maxArraySize=10000\n"; + cmds += " maxArraySize=10000"; + cmds += "\n"; + cmds += "!qtcreatorcdbext.locals -t -D -e " + expanded + " -v -c 0\n" "q\n"; } else if (m_debuggerEngine == LldbEngine) { @@ -1544,8 +1547,10 @@ void tst_Dumpers::dumper_data() + Check("ba1.13", "[13]", "2", "char") + CheckType("ba2", "@QByteArray") - + Check("s", '"' + QByteArray(100, 'x') + '"', "@QString") - + Check("ss", '"' + QByteArray(100, 'c') + '"', "std::string") + + Check("s", '"' + QByteArray(100, 'x') + '"', "@QString") % NoCdbEngine + + Check("s", '"' + QByteArray(100, 'x') + "..." + '"', "@QString") % CdbEngine + + Check("ss", '"' + QByteArray(100, 'c') + '"', "std::string") % NoCdbEngine + + Check("ss", '"' + QByteArray(100, 'c') + "..." + '"', "std::string") % CdbEngine + Check("buf1", "\"" + QByteArray(1, (char)0xee) + "\"", "@QByteArray") + Check("buf2", "\"" + QByteArray(1, (char)0xee) + "\"", "@QByteArray")