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

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Change-Id: I53a31b3463b2bd8efffb1c00e5d172854d8ff5e5
This commit is contained in:
Eike Ziller
2017-09-08 13:06:07 +02:00
parent 79e94ddae8 315cede70f
commit a9aac73e37
17 changed files with 102 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit/unittest/clangdocumentsuspenderresumer-test.cpp
+8 -8
View File
@@ -183,7 +183,7 @@ TEST_F(DocumentSuspenderResumer, CategorizeWithMoreVisibleDocumentsThanHotDocume
ASSERT_THAT(coldDocuments, IsEmpty());
}
TEST_F(DocumentSuspenderResumer, CreateSuspendJobForInvisible)
TEST_F(DocumentSuspenderResumer, DISABLED_WITHOUT_SUSPEND_PATCH(CreateSuspendJobForInvisible))
{
Document document = documents.create({fileContainer1})[0];
document.setIsSuspended(false);
@@ -199,7 +199,7 @@ TEST_F(DocumentSuspenderResumer, CreateSuspendJobForInvisible)
ASSERT_THAT(jobs, ContainerEq(expectedJobs));
}
TEST_F(DocumentSuspenderResumer, DoNotCreateSuspendJobForVisible)
TEST_F(DocumentSuspenderResumer, DISABLED_WITHOUT_SUSPEND_PATCH(DoNotCreateSuspendJobForVisible))
{
Document document = documents.create({fileContainer1})[0];
document.setIsSuspended(false);
@@ -210,7 +210,7 @@ TEST_F(DocumentSuspenderResumer, DoNotCreateSuspendJobForVisible)
ASSERT_THAT(jobs, IsEmpty());
}
TEST_F(DocumentSuspenderResumer, DoNotCreateSuspendJobForUnparsed)
TEST_F(DocumentSuspenderResumer, DISABLED_WITHOUT_SUSPEND_PATCH(DoNotCreateSuspendJobForUnparsed))
{
Document document = documents.create({fileContainer1})[0];
document.setIsSuspended(false);
@@ -221,7 +221,7 @@ TEST_F(DocumentSuspenderResumer, DoNotCreateSuspendJobForUnparsed)
ASSERT_THAT(jobs, IsEmpty());
}
TEST_F(DocumentSuspenderResumer, CreateSuspendJobsForDocumentWithSupportiveTranslationUnit)
TEST_F(DocumentSuspenderResumer, DISABLED_WITHOUT_SUSPEND_PATCH(CreateSuspendJobsForDocumentWithSupportiveTranslationUnit))
{
Document document = documents.create({fileContainer1})[0];
document.setIsSuspended(false);
@@ -238,7 +238,7 @@ TEST_F(DocumentSuspenderResumer, CreateSuspendJobsForDocumentWithSupportiveTrans
ASSERT_THAT(jobs, ContainerEq(expectedJobs));
}
TEST_F(DocumentSuspenderResumer, CreateResumeJob)
TEST_F(DocumentSuspenderResumer, DISABLED_WITHOUT_SUSPEND_PATCH(CreateResumeJob))
{
Document document = documents.create({fileContainer1})[0];
document.setIsSuspended(true);
@@ -252,7 +252,7 @@ TEST_F(DocumentSuspenderResumer, CreateResumeJob)
ASSERT_THAT(jobs, ContainerEq(expectedJobs));
}
TEST_F(DocumentSuspenderResumer, DoNotCreateResumeJobForInvisible)
TEST_F(DocumentSuspenderResumer, DISABLED_WITHOUT_SUSPEND_PATCH(DoNotCreateResumeJobForInvisible))
{
Document document = documents.create({fileContainer1})[0];
document.setIsSuspended(true);
@@ -263,7 +263,7 @@ TEST_F(DocumentSuspenderResumer, DoNotCreateResumeJobForInvisible)
ASSERT_THAT(jobs, IsEmpty());
}
TEST_F(DocumentSuspenderResumer, CreateResumeJobsForDocumentWithSupportiveTranslationUnit)
TEST_F(DocumentSuspenderResumer, DISABLED_WITHOUT_SUSPEND_PATCH(CreateResumeJobsForDocumentWithSupportiveTranslationUnit))
{
Document document = documents.create({fileContainer1})[0];
document.setIsSuspended(true);
@@ -279,7 +279,7 @@ TEST_F(DocumentSuspenderResumer, CreateResumeJobsForDocumentWithSupportiveTransl
ASSERT_THAT(jobs, ContainerEq(expectedJobs));
}
TEST_F(DocumentSuspenderResumer, CreateSuspendAndResumeJobs)
TEST_F(DocumentSuspenderResumer, DISABLED_WITHOUT_SUSPEND_PATCH(CreateSuspendAndResumeJobs))
{
Document hotDocument = documents.create({fileContainer1})[0];
hotDocument.setIsSuspended(true);
tests/unit/unittest/clangsuspenddocumentjob-test.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ TEST_F(SuspendDocumentJob, RunAsync)
ASSERT_TRUE(waitUntilJobFinished(job));
}
TEST_F(SuspendDocumentJob, DocumentIsSuspendedAfterRun)
TEST_F(SuspendDocumentJob, DISABLED_WITHOUT_SUSPEND_PATCH(DocumentIsSuspendedAfterRun))
{
document.parse();
job.setContext(jobContext);
tests/unit/unittest/conditionally-disabled-tests.h
+8
View File
@@ -26,6 +26,8 @@
#include <QtGlobal>
#include <clang-c/Index.h>
#include <clangbackend_global.h>
#ifdef Q_OS_WIN
# define DISABLED_ON_WINDOWS(x) DISABLED_##x
#else
@@ -37,3 +39,9 @@
#else
# define DISABLED_ON_CLANG3(x) x
#endif
#ifdef IS_SUSPEND_SUPPORTED
# define DISABLED_WITHOUT_SUSPEND_PATCH(x) x
#else
# define DISABLED_WITHOUT_SUSPEND_PATCH(x) DISABLED_##x
#endif