diff options
| author | hjk <hjk@qt.io> | 2018-09-14 16:27:22 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2018-09-17 09:22:23 +0000 |
| commit | e507abf6a6a9c6d023fa691f8aa1f49580c5d6ad (patch) | |
| tree | 15cbb7155495602d741204f6e14b97f60a06555b /tests/auto | |
| parent | 0e1dcc2eb78b75331ad520e33a978ec4acf30d1f (diff) | |
| download | qt-creator-e507abf6a6a9c6d023fa691f8aa1f49580c5d6ad.tar.gz | |
Debugger: Use new CheckSet infrastructure in AnonymousStruct test
Change-Id: Ib3e2ea2ab8a70ebfe94d80a0b0bf4b57fdb9027a
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/debugger/tst_dumpers.cpp | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 67c5892861..1d5d63ab0a 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -5265,16 +5265,12 @@ void tst_Dumpers::dumper_data() + Check("a.d", FloatValue("9.1245819032257467e-313"), "double") - //+ Check("a.b", "43", "int") % GdbVersion(0, 70699) - //+ Check("a.i", "42", "int") % GdbVersion(0, 70699) - //+ Check("a.f", ff, "float") % GdbVersion(0, 70699) - - + Check("a.#1.b", "43", "int") % NoCdbEngine - + Check("a.#1.i", "42", "int") % NoCdbEngine - + Check("a.#2.f", ff, "float") % NoCdbEngine - + Check("a.b", "43", "int") % CdbEngine - + Check("a.i", "42", "int") % CdbEngine - + Check("a.f", ff, "float") % CdbEngine; + + CheckSet({{"a.#1.b", "43", "int"}, // LLDB, new GDB + {"a.b", "43", "int"}}) // CDB, old GDB + + CheckSet({{"a.#1.i", "42", "int"}, + {"a.i", "42", "int"}}) + + CheckSet({{"a.#2.f", ff, "float"}, + {"a.f", ff, "float"}}); QTest::newRow("Chars") @@ -6511,10 +6507,10 @@ void tst_Dumpers::dumper_data() "std::_Tree_simple_types<std::pair<" "std::string const ,std::list<std::string>>>>>", "std::map<std::string, std::list<std::string> >::const_iterator")) - + Check("it.first", "\"one\"", "std::string") % NoCdbEngine - + Check("it.second", "<3 items>", "std::list<std::string>") % NoCdbEngine - + Check("it.0.first", "\"one\"", "std::string") % CdbEngine - + Check("it.0.second", "<3 items>", "std::list<std::string>") % CdbEngine; + + CheckSet({{"it.first", "\"one\"", "std::string"}, // NoCdbEngine + {"it.0.first", "\"one\"", "std::string"}}) // CdbEngine + + CheckSet({{"it.second", "<3 items>", "std::list<std::string>"}, + {"it.0.second", "<3 items>", "std::list<std::string>"}}); QTest::newRow("Varargs") << Data("#include <stdarg.h>\n" @@ -6689,8 +6685,8 @@ void tst_Dumpers::dumper_data() + Check("v", "", TypePattern("main::.*::Test")) % CdbEngine //+ Check("v.a", "1", "int") % GdbVersion(0, 70699) //+ Check("v.0.a", "1", "int") % GdbVersion(70700) - + Check("v.#1.a", "1", "int") % NoCdbEngine - + Check("v.a", "1", "int") % CdbEngine; + + CheckSet({{"v.#1.a", "1", "int"}, + {"v.a", "1", "int"}}); QTest::newRow("Gdb10586eclipse") @@ -6707,12 +6703,12 @@ void tst_Dumpers::dumper_data() + Check("n", "", TypePattern("main::.*::S")) % CdbEngine //+ Check("v.a", "2", "int") % GdbVersion(0, 70699) //+ Check("v.0.a", "2", "int") % GdbVersion(70700) - + Check("v.#1.a", "2", "int") % NoCdbEngine - + Check("v.a", "2", "int") % CdbEngine + + CheckSet({{"v.#1.a", "2", "int"}, + {"v.a", "2", "int"}}) //+ Check("v.b", "3", "int") % GdbVersion(0, 70699) //+ Check("v.1.b", "3", "int") % GdbVersion(70700) - + Check("v.#2.b", "3", "int") % NoCdbEngine - + Check("v.b", "3", "int") % CdbEngine + + CheckSet({{"v.#2.b", "3", "int"}, + {"v.b", "3", "int"}}) + Check("v.x", "1", "int") + Check("n.x", "10", "int") + Check("n.y", "20", "int"); |