feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Test: Correct path of loaded project for Mac

Browse Source 
Change-Id: I91e0126b0f66e1635c6c1427d9f22842eeafcdd9
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Christian Stenger
2013-05-30 12:57:41 +02:00
committed by hjk
parent 8b10d97767
commit 21c821806d
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -3582,11 +3582,10 @@ void DebuggerPlugin::testPythonDumpers()
void DebuggerPluginPrivate::testPythonDumpers1() void DebuggerPluginPrivate::testPythonDumpers1()
{ {
m_testSuccess = true; m_testSuccess = true;
QString proFile = ICore::resourcePath() QString proFile = ICore::resourcePath();
#ifndef Q_OS_MAC if (Utils::HostOsInfo::isMacHost())
+ QLatin1String("/../..") proFile += QLatin1String("/../..");
#endif proFile += QLatin1String("/../../tests/manual/debugger/simple/simple.pro");
+ QLatin1String("/tests/manual/debugger/simple/simple.pro");
testLoadProject(proFile, TestCallBack(this, "testPythonDumpers2")); testLoadProject(proFile, TestCallBack(this, "testPythonDumpers2"));
QVERIFY(m_testSuccess); QVERIFY(m_testSuccess);
QTestEventLoop::instance().enterLoop(20); QTestEventLoop::instance().enterLoop(20);
@@ -3617,8 +3616,10 @@ void DebuggerPlugin::testStateMachine()
void DebuggerPluginPrivate::testStateMachine1() void DebuggerPluginPrivate::testStateMachine1()
{ {
m_testSuccess = true; m_testSuccess = true;
QString proFile = ICore::resourcePath() QString proFile = ICore::resourcePath();
+ QLatin1String("/../../tests/manual/debugger/simple/simple.pro"); if (Utils::HostOsInfo::isMacHost())
proFile += QLatin1String("/../..");
proFile += QLatin1String("/../../tests/manual/debugger/simple/simple.pro");
testLoadProject(proFile, TestCallBack(this, "testStateMachine2")); testLoadProject(proFile, TestCallBack(this, "testStateMachine2"));
QVERIFY(m_testSuccess); QVERIFY(m_testSuccess);
QTestEventLoop::instance().enterLoop(20); QTestEventLoop::instance().enterLoop(20);