[eclipse/xtext-core#1003] run generateTestLanguages before test

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
This commit is contained in:
Christian Dietrich 2019-01-28 15:30:58 +01:00
parent 1c0c1cb0c4
commit 67e873d5e4
3 changed files with 65 additions and 0 deletions

View file

@ -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'
}
}

View file

@ -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'
}
}

View file

@ -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'