diff --git a/tests/unit/unittest/clangdocumentsuspenderresumer-test.cpp b/tests/unit/unittest/clangdocumentsuspenderresumer-test.cpp index 8c1954410fb3fb440864818580546c3f443a7960..8f51e7b089622238bc1fe26859bf9fdff1eba732 100644 --- a/tests/unit/unittest/clangdocumentsuspenderresumer-test.cpp +++ b/tests/unit/unittest/clangdocumentsuspenderresumer-test.cpp @@ -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); diff --git a/tests/unit/unittest/clangsuspenddocumentjob-test.cpp b/tests/unit/unittest/clangsuspenddocumentjob-test.cpp index b9f92f3beb56045f92bcf202465ef544f8de7269..a6aeaf9efe37f260555c1dac891843d7aac0fb9b 100644 --- a/tests/unit/unittest/clangsuspenddocumentjob-test.cpp +++ b/tests/unit/unittest/clangsuspenddocumentjob-test.cpp @@ -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); diff --git a/tests/unit/unittest/conditionally-disabled-tests.h b/tests/unit/unittest/conditionally-disabled-tests.h index 88bec6b0b33da3c1fe847558576d299db98473e3..29879bbee5cebbcfe904e39d69ff3eefedf64678 100644 --- a/tests/unit/unittest/conditionally-disabled-tests.h +++ b/tests/unit/unittest/conditionally-disabled-tests.h @@ -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