From 21c821806db143239d1824af42eac2dcb216c76f Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 30 May 2013 12:57:41 +0200 Subject: [PATCH] Test: Correct path of loaded project for Mac Change-Id: I91e0126b0f66e1635c6c1427d9f22842eeafcdd9 Reviewed-by: hjk --- src/plugins/debugger/debuggerplugin.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index f90354e2b78..4dca818a7cf 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -3582,11 +3582,10 @@ void DebuggerPlugin::testPythonDumpers() void DebuggerPluginPrivate::testPythonDumpers1() { m_testSuccess = true; - QString proFile = ICore::resourcePath() -#ifndef Q_OS_MAC - + QLatin1String("/../..") -#endif - + QLatin1String("/tests/manual/debugger/simple/simple.pro"); + QString proFile = ICore::resourcePath(); + if (Utils::HostOsInfo::isMacHost()) + proFile += QLatin1String("/../.."); + proFile += QLatin1String("/../../tests/manual/debugger/simple/simple.pro"); testLoadProject(proFile, TestCallBack(this, "testPythonDumpers2")); QVERIFY(m_testSuccess); QTestEventLoop::instance().enterLoop(20); @@ -3617,8 +3616,10 @@ void DebuggerPlugin::testStateMachine() void DebuggerPluginPrivate::testStateMachine1() { m_testSuccess = true; - QString proFile = ICore::resourcePath() - + QLatin1String("/../../tests/manual/debugger/simple/simple.pro"); + QString proFile = ICore::resourcePath(); + if (Utils::HostOsInfo::isMacHost()) + proFile += QLatin1String("/../.."); + proFile += QLatin1String("/../../tests/manual/debugger/simple/simple.pro"); testLoadProject(proFile, TestCallBack(this, "testStateMachine2")); QVERIFY(m_testSuccess); QTestEventLoop::instance().enterLoop(20);