From bf9a3b2020b033e8dc303fcb2b810d3b0051db25 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 26 Nov 2014 18:10:14 +0100 Subject: Debugger: Fix LLDB reference display for LLDB 320.x There is seemingly still no proper API for that, and the old hack broke. Use a new one. Change-Id: I9e638ca1fbd84c43c7d31b65e017792d1b6a1e0b Reviewed-by: Christian Stenger --- tests/auto/debugger/tst_dumpers.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 9d55438e21..059d388080 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -1441,7 +1441,10 @@ void tst_Dumpers::dumper_data() "public:\n" " Foo(int i = 0)\n" " : a(i), b(2)\n" - " {}\n" + " {\n" + " for (int j = 0; j < 6; ++j)\n" + " x[j] = 'a' + j;\n" + " }\n" " virtual ~Foo()\n" " {\n" " a = 5;\n" @@ -4845,12 +4848,12 @@ void tst_Dumpers::dumper_data() QTest::newRow("Reference") - << Data(fooData + - "#include \n" + << Data("#include \n" "#include \n" "using namespace std;\n" - "string fooxx() { return \"bababa\"; }\n", + "string fooxx() { return \"bababa\"; }\n" + + fooData, "int a1 = 43;\n" "const int &b1 = a1;\n" @@ -4888,7 +4891,7 @@ void tst_Dumpers::dumper_data() + Check("a2", "\"hello\"", "std::string") + Check("b2", "\"bababa\"", Pattern("(std::)?string &")) // Clang... + Check("c2", "\"world\"", "std::string") - + Check("d2", "\"hello\"", "Ref2") + + Check("d2", "\"hello\"", "Ref2") % NoLldbEngine + Check("a3", "\"hello\"", "@QString") + Check("b3", "\"hello\"", "@QString &") @@ -4901,7 +4904,6 @@ void tst_Dumpers::dumper_data() //+ Check("d4", "\"hello\"", "Ref4"); FIXME: We get "Foo &" instead + Check("d4.a", "12", "int"); - QTest::newRow("DynamicReference") << Data("struct BaseClass { virtual ~BaseClass() {} };\n" "struct DerivedClass : BaseClass {};\n", -- cgit v1.2.1