From 14a02d5081ecc16327a723029a521e40902cb35a Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 10 Mar 2015 09:51:55 +0100 Subject: [PATCH] Debugger: Tests: Fix execution of dumper tests on OSX Change-Id: Ibe3e447d29e3834766ef067ba4424c3b08ba5eb1 Reviewed-by: hjk --- share/qtcreator/debugger/lldbbridge.py | 2 +- tests/auto/debugger/tst_dumpers.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index 959d2008bbd..c9b8eb2d6ce 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -1721,7 +1721,7 @@ class Tester(Dumper): self.expandedINames = set(expandedINames) self.passExceptions = True - self.loadDumperFiles() + self.loadDumperFiles({}) error = lldb.SBError() self.target = self.debugger.CreateTarget(binary, None, None, True, error) diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index ff3da1dd52d..1f6c947ca73 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -1287,6 +1287,8 @@ void tst_Dumpers::dumper() debugger.setWorkingDirectory(t->buildPath); debugger.start(QString::fromLatin1(exe), args); QVERIFY(debugger.waitForStarted()); + // FIXME: next line is necessary for LLDB <= 310 - remove asap + debugger.waitForReadyRead(1000); debugger.write(cmds); QVERIFY(debugger.waitForFinished()); output = debugger.readAllStandardOutput();