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

VcsBase: Fix ClearCase plugin unit test

Browse Source 
Change-Id: Icd1ff6a3e58a654babae4ebf3a4e33a26c4a58f4
(cherry picked from commit b3b3b41a7f)
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Christian Stenger
2015-11-30 10:17:45 +01:00
parent 8650954f0a
commit bfeb60ace5
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/vcsbase/vcsbase.pro
View File

@@ -64,3 +64,5 @@ FORMS += commonsettingspage.ui \
nicknamedialog.ui \ nicknamedialog.ui \
cleandialog.ui \ cleandialog.ui \
submiteditorwidget.ui submiteditorwidget.ui
equals(TEST, 1): DEFINES += "SRC_DIR=\\\"$$IDE_SOURCE_TREE\\\""

2
src/plugins/vcsbase/vcsbase.qbs
View File

@@ -83,4 +83,6 @@ QtcPlugin {
"wizard/vcsjsextension.cpp", "wizard/vcsjsextension.cpp",
"wizard/vcsjsextension.h", "wizard/vcsjsextension.h",
] ]
cpp.defines: base.concat( testsEnabled ? ['SRC_DIR="' + project.ide_source_tree + '"'] : [] )
} }

2
src/plugins/vcsbase/vcsbaseeditor.cpp
View File

@@ -1635,6 +1635,8 @@ void VcsBase::VcsBaseEditorWidget::testDiffFileResolving(const char *id)
QFETCH(QByteArray, fileName); QFETCH(QByteArray, fileName);
QTextDocument doc(QString::fromLatin1(header)); QTextDocument doc(QString::fromLatin1(header));
QTextBlock block = doc.lastBlock(); QTextBlock block = doc.lastBlock();
// set source root for shadow builds
widget->setSource(QString::fromLatin1(SRC_DIR));
QVERIFY(widget->fileNameFromDiffSpecification(block).endsWith(QString::fromLatin1(fileName))); QVERIFY(widget->fileNameFromDiffSpecification(block).endsWith(QString::fromLatin1(fileName)));
delete editor; delete editor;