Commit 21c82180 authored by Christian Stenger's avatar Christian Stenger Committed by hjk
Browse files

Test: Correct path of loaded project for Mac



Change-Id: I91e0126b0f66e1635c6c1427d9f22842eeafcdd9
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent 8b10d977
...@@ -3582,11 +3582,10 @@ void DebuggerPlugin::testPythonDumpers() ...@@ -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() ...@@ -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);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment