From 67e873d5e413933907a546fc9d07a518a2611a15 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Mon, 28 Jan 2019 15:30:58 +0100 Subject: [PATCH] [eclipse/xtext-core#1003] run generateTestLanguages before test Signed-off-by: Christian Dietrich --- org.eclipse.xtext.ide.tests/build.gradle | 21 +++++++++++++++++++ org.eclipse.xtext.testlanguages/build.gradle | 22 ++++++++++++++++++++ org.eclipse.xtext.tests/build.gradle | 22 ++++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/org.eclipse.xtext.ide.tests/build.gradle b/org.eclipse.xtext.ide.tests/build.gradle index 2455c4f0b..44b729e38 100644 --- a/org.eclipse.xtext.ide.tests/build.gradle +++ b/org.eclipse.xtext.ide.tests/build.gradle @@ -29,4 +29,25 @@ task generateTestLanguages(type: XtextGeneratorTask) { workflow = file('testlang-src/org/eclipse/xtext/ide/tests/testlanguage/GenerateTestLanguage.mwe2') inputs.file 'testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguage.xtext' outputs.dir 'testlang-src-gen' + dependsOn 'processTestResources' +} + +tasks.getByName('compileTestJava') { + mustRunAfter 'generateTestLanguages' +} + +tasks.getByName('compileJava') { + mustRunAfter 'generateTestLanguages' +} + +if (tasks.findByName('generateTestXtext')) { + tasks.getByName('generateTestXtext') { + mustRunAfter 'generateTestLanguages' + } +} + +if (tasks.findByName('generateXtext')) { + tasks.getByName('generateXtext') { + mustRunAfter 'generateTestLanguages' + } } diff --git a/org.eclipse.xtext.testlanguages/build.gradle b/org.eclipse.xtext.testlanguages/build.gradle index 3b0b22cea..9726f55bd 100644 --- a/org.eclipse.xtext.testlanguages/build.gradle +++ b/org.eclipse.xtext.testlanguages/build.gradle @@ -14,4 +14,26 @@ sourceSets.mwe2.runtimeClasspath += processResources.outputs.files task generateTestLanguages(type: XtextGeneratorTask) { workflow = file('src/org/eclipse/xtext/testlanguages/GenerateTestLanguages.mwe2') outputs.dir 'src-gen' + dependsOn 'processTestResources' } + +tasks.getByName('compileTestJava') { + mustRunAfter 'generateTestLanguages' +} + +tasks.getByName('compileJava') { + mustRunAfter 'generateTestLanguages' +} + +if (tasks.findByName('generateTestXtext')) { + tasks.getByName('generateTestXtext') { + mustRunAfter 'generateTestLanguages' + } +} + +if (tasks.findByName('generateXtext')) { + tasks.getByName('generateXtext') { + mustRunAfter 'generateTestLanguages' + } +} + diff --git a/org.eclipse.xtext.tests/build.gradle b/org.eclipse.xtext.tests/build.gradle index f5294810c..5003fbf60 100644 --- a/org.eclipse.xtext.tests/build.gradle +++ b/org.eclipse.xtext.tests/build.gradle @@ -38,8 +38,30 @@ sourcesJar.from sourceSets.mwe2.allSource task generateTestLanguages(type: XtextGeneratorTask) { workflow = file('src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2') outputs.dir 'src-gen' + dependsOn 'processTestResources' } +tasks.getByName('compileTestJava') { + mustRunAfter 'generateTestLanguages' +} + +tasks.getByName('compileJava') { + mustRunAfter 'generateTestLanguages' +} + +if (tasks.findByName('generateTestXtext')) { + tasks.getByName('generateTestXtext') { + mustRunAfter 'generateTestLanguages' + } +} + +if (tasks.findByName('generateXtext')) { + tasks.getByName('generateXtext') { + mustRunAfter 'generateTestLanguages' + } +} + + test { exclude 'org.eclipse.xtext.serializer.contextFinderTest.NestedTypeRecursiveTest.class' exclude '**/*Suite.class'