From aa221121b616399a2d6b8a3ee31f51766fc59d8e Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 10 Nov 2015 09:23:58 +0100 Subject: [PATCH] Debugger: Pass down expanded inames in LLDB tests ... as well as the 'autoderef' flag. A lot of dumper tests were failing even though the dumpers themselves were ok. Change-Id: I198784d95eb0004e81bfab995121e048b1722c66 Reviewed-by: Christian Stenger --- share/qtcreator/debugger/lldbbridge.py | 13 ++++--------- tests/auto/debugger/tst_dumpers.cpp | 7 +++++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index df91bb32416..e49d71730fd 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -1767,14 +1767,9 @@ class Dumper(DumperBase): # Used in dumper auto test. class Tester(Dumper): - def __init__(self, binary, expandedINames): + def __init__(self, binary, args): Dumper.__init__(self) lldb.theDumper = self - - self.expandedINames = set(expandedINames) - self.passExceptions = True - self.sortStructMembers = True - self.loadDumpers({'token': 1}) error = lldb.SBError() self.target = self.debugger.CreateTarget(binary, None, None, True, error) @@ -1783,14 +1778,14 @@ class Tester(Dumper): warn("ERROR: %s" % error) return - s = threading.Thread(target=self.testLoop, args=[]) + s = threading.Thread(target=self.testLoop, args=(args,)) s.start() s.join(30) def reportDumpers(self, msg): pass - def testLoop(self): + def testLoop(self, args): # Disable intermediate reporting. savedReport = self.report self.report = lambda stuff: 0 @@ -1833,7 +1828,7 @@ class Tester(Dumper): if line != 0: self.report = savedReport self.process.SetSelectedThread(stoppedThread) - self.fetchVariables({'token':2, 'fancy':1}) + self.fetchVariables(args) #self.describeLocation(frame) self.report("@NS@%s@" % self.qtNamespace()) #self.report("ENV=%s" % os.environ.items()) diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 9d6a3a7cf70..f55827bfccb 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -1300,7 +1300,8 @@ void tst_Dumpers::dumper() "python from gdbbridge import *\n" "python theDumper.setupDumpers()\n" "run " + nograb + "\n" - "python theDumper.fetchVariables({'fancy':1,'forcens':1," + "python theDumper.fetchVariables({" + "'token':2,'fancy':1,'forcens':1,'sortstructs':1," "'autoderef':1,'dyntype':1,'passexceptions':1," "'expanded':[" + expandedq + "]})\n"; @@ -1331,7 +1332,9 @@ void tst_Dumpers::dumper() "sc sys.path.insert(1, '" + dumperDir + "')\n" "sc from lldbbridge import *\n" // "sc print(dir())\n" - "sc Tester('" + t->buildPath.toLatin1() + "/doit', [" + expandedq + "])\n" + "sc Tester('" + t->buildPath.toLatin1() + "/doit', {'fancy':1,'forcens':1," + "'autoderef':1,'dyntype':1,'passexceptions':1," + "'expanded':[" + expandedq + "]})\n" "quit\n"; fullLldb.write(cmds);