From bfeb60ace592950eb148808716edf2d7bc69b477 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 30 Nov 2015 10:17:45 +0100 Subject: [PATCH] VcsBase: Fix ClearCase plugin unit test Change-Id: Icd1ff6a3e58a654babae4ebf3a4e33a26c4a58f4 (cherry picked from commit b3b3b41a7f8f06f281e18df33f46cf5a0b6c9d0d) Reviewed-by: Orgad Shaneh Reviewed-by: Christian Stenger --- src/plugins/vcsbase/vcsbase.pro | 2 ++ src/plugins/vcsbase/vcsbase.qbs | 2 ++ src/plugins/vcsbase/vcsbaseeditor.cpp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/plugins/vcsbase/vcsbase.pro b/src/plugins/vcsbase/vcsbase.pro index b433f817433..e256da05153 100644 --- a/src/plugins/vcsbase/vcsbase.pro +++ b/src/plugins/vcsbase/vcsbase.pro @@ -64,3 +64,5 @@ FORMS += commonsettingspage.ui \ nicknamedialog.ui \ cleandialog.ui \ submiteditorwidget.ui + +equals(TEST, 1): DEFINES += "SRC_DIR=\\\"$$IDE_SOURCE_TREE\\\"" diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs index 857577a46a9..fc120227722 100644 --- a/src/plugins/vcsbase/vcsbase.qbs +++ b/src/plugins/vcsbase/vcsbase.qbs @@ -83,4 +83,6 @@ QtcPlugin { "wizard/vcsjsextension.cpp", "wizard/vcsjsextension.h", ] + + cpp.defines: base.concat( testsEnabled ? ['SRC_DIR="' + project.ide_source_tree + '"'] : [] ) } diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index cb1c238aba2..0925088a83b 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -1635,6 +1635,8 @@ void VcsBase::VcsBaseEditorWidget::testDiffFileResolving(const char *id) QFETCH(QByteArray, fileName); QTextDocument doc(QString::fromLatin1(header)); QTextBlock block = doc.lastBlock(); + // set source root for shadow builds + widget->setSource(QString::fromLatin1(SRC_DIR)); QVERIFY(widget->fileNameFromDiffSpecification(block).endsWith(QString::fromLatin1(fileName))); delete editor;