Commit 069ad73f authored by Eike Ziller's avatar Eike Ziller Committed by hjk
Browse files

Mac: Fix insource build



Change-Id: Iadbb51b48ea82afc398b59148d603867b0439448
Reviewed-by: default avatarAurindam Jana <aurindam.jana@digia.com>
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@digia.com>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 69e022d1
......@@ -161,9 +161,10 @@ include(namedemangler/namedemangler.pri)
include(shared/shared.pri)
equals(TEST, 1):!isEmpty(copydata) {
TEST_DIR = ../../../tests/manual/debugger/simple
INPUT_FILE = $$PWD/$$TEST_DIR/simple.pro
OUTPUT_DIR = $$OUT_PWD/$$TEST_DIR
TEST_DIR = tests/manual/debugger/simple
INPUT_FILE = $$IDE_SOURCE_TREE/$$TEST_DIR/simple.pro
macx: OUTPUT_DIR = $$IDE_DATA_PATH/$$TEST_DIR
else: OUTPUT_DIR = $$IDE_BUILD_TREE/$$TEST_DIR
win32 {
INPUT_FILE ~= s,/,\\\\,g
OUTPUT_DIR ~= s,/,\\\\,g
......@@ -171,8 +172,8 @@ equals(TEST, 1):!isEmpty(copydata) {
isEmpty(QMAKE_CHK_EXISTS_GLUE):QMAKE_CHK_EXISTS_GLUE = "|| "
}
testfile.target = test_resources
testfile.commands = ($$QMAKE_CHK_DIR_EXISTS $$OUTPUT_DIR $$QMAKE_CHK_EXISTS_GLUE $$QMAKE_MKDIR $$OUTPUT_DIR) \
&& $$QMAKE_COPY $$INPUT_FILE $$OUTPUT_DIR
testfile.commands = ($$QMAKE_CHK_DIR_EXISTS \"$$OUTPUT_DIR\" $$QMAKE_CHK_EXISTS_GLUE $$QMAKE_MKDIR \"$$OUTPUT_DIR\") \
&& $$QMAKE_COPY \"$$INPUT_FILE\" \"$$OUTPUT_DIR\"
QMAKE_EXTRA_TARGETS += testfile
PRE_TARGETDEPS += $$testfile.target
}
......@@ -3529,7 +3529,10 @@ void DebuggerPluginPrivate::testPythonDumpers1()
{
m_testSuccess = true;
QString proFile = ICore::resourcePath()
+ QLatin1String("/../../tests/manual/debugger/simple/simple.pro");
#ifndef Q_OS_MAC
+ QLatin1String("/../..")
#endif
+ QLatin1String("/tests/manual/debugger/simple/simple.pro");
testLoadProject(proFile, TestCallBack(this, "testPythonDumpers2"));
QVERIFY(m_testSuccess);
QTestEventLoop::instance().enterLoop(20);
......
Markdown is supported
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