[examples] Add Gradle build for examples, tutorials, templates

Bug 468818

Change-Id: I9a2eb2238f6ddc703b693997bd6578620a11e385

23 files changed, 193 insertions, 69 deletions

diff --git a/build.gradle b/build.gradle
index 96b05ec56..ab8a48f10 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.xtext.xtend' version '2.0.4'
+	id 'org.xtext.xtend' version '2.0.7'
 }
 
 apply from: "$rootDir/gradle/scmVersion.gradle"
diff --git a/examples/org.eclipse.etrice.examples.c/build.gradle b/examples/org.eclipse.etrice.examples.c/build.gradle
new file mode 100644
index 000000000..432d406ec
--- /dev/null
+++ b/examples/org.eclipse.etrice.examples.c/build.gradle
@@ -0,0 +1,30 @@
+apply plugin: 'c'
+apply from: "$rootDir/gradle/etTest.gradle"
+
+dependencies {
+	modelpath_c files('model/Features', 'model/TrafficLight', (1..4).collect { i -> "model/TrafficLight_step${i}" })
+}
+
+def features = [
+	'ActorClassExamples.room', 'ActorRefs.room', 'Attributes.room',
+	'CommunicationAndExecutionTypes.room', 'DataTypes.room', 'Features.etmap',
+	'Features.room', 'Inheritance.room', 'Multiplicity.room',
+	'Operations.room', 'PortRoles.room', 'ProtocolClasses.room'
+].collect { 'model/features/' + it }
+
+/* Doesn't compile due to classes with same name
+createBuild('c', 'features', [
+		'ActorClassExamples.room', 'ActorRefs.room', 'Attributes.room',
+		'CommunicationAndExecutionTypes.room', 'DataTypes.room', 'Features.etmap',
+		'Features.room', 'Inheritance.room', 'Multiplicity.room',
+		'Operations.room', 'PortRoles.room', 'ProtocolClasses.room'
+	].collect { 'model/features/' + it })
+*/
+
+1.upto(4) { i ->
+	createBuild('c', "trafficLight_step${i}", [
+			'model/TrafficLight/TrafficLight.room',
+			"model/TrafficLight_step${i}/TrafficLight_step${i}.etmap",
+			"model/TrafficLight_step${i}/TrafficLight_step${i}.room"
+		])
+}
\ No newline at end of file
diff --git a/examples/org.eclipse.etrice.examples.java/build.gradle b/examples/org.eclipse.etrice.examples.java/build.gradle
new file mode 100644
index 000000000..0a2734c18
--- /dev/null
+++ b/examples/org.eclipse.etrice.examples.java/build.gradle
@@ -0,0 +1,14 @@
+apply plugin: 'java-base'
+apply from: "$rootDir/gradle/etTest.gradle"
+
+dependencies {
+	modelpath_java files((1..9).collect { i -> "model/dynamicactors${i}" })
+}
+
+1.upto(9) { i ->
+	createBuild('java', "dynamicactors${i}",
+		["model/dynamicactors${i}/DynAct${i}.etmap", "model/dynamicactors${i}/DynAct${i}.room"],
+		['-persistable', '-storeDataObj'])
+}
+
+sourceSets.dynamicactors8.java.srcDir 'src'
\ No newline at end of file
diff --git a/examples/org.eclipse.etrice.template.c/build.gradle b/examples/org.eclipse.etrice.template.c/build.gradle
new file mode 100644
index 000000000..9d65f8813
--- /dev/null
+++ b/examples/org.eclipse.etrice.template.c/build.gradle
@@ -0,0 +1,13 @@
+apply plugin: 'c'
+apply from: "$rootDir/gradle/etTest.gradle"
+
+dependencies {
+	modelpath_c files('model')
+}
+
+def models = [
+	'model/Mapping.etmap',
+	'model/TemplateModel.room'
+]
+
+createBuild('c', 'template', models)
\ No newline at end of file
diff --git a/examples/org.eclipse.etrice.template.cpp/build.gradle b/examples/org.eclipse.etrice.template.cpp/build.gradle
new file mode 100644
index 000000000..f949de376
--- /dev/null
+++ b/examples/org.eclipse.etrice.template.cpp/build.gradle
@@ -0,0 +1,13 @@
+apply plugin: 'cpp'
+apply from: "$rootDir/gradle/etTest.gradle"
+
+dependencies {
+	modelpath_cpp files('model')
+}
+
+def models = [
+	'model/Mapping.etmap',
+	'model/TemplateModel.room'
+]
+
+createBuild('cpp', 'template', models)
\ No newline at end of file
diff --git a/examples/org.eclipse.etrice.tutorials.c/build.gradle b/examples/org.eclipse.etrice.tutorials.c/build.gradle
new file mode 100644
index 000000000..a7a4fd3c1
--- /dev/null
+++ b/examples/org.eclipse.etrice.tutorials.c/build.gradle
@@ -0,0 +1,9 @@
+apply plugin: 'c'
+apply from: "$rootDir/gradle/etTest.gradle"
+
+dependencies {
+	modelpath_c files('model/HelloWorld', 'model/PingPong')
+}
+
+createBuild('c', 'helloWorld', ['model/HelloWorld/Mapping.etmap', 'model/HelloWorld/HelloWorld.room'])
+createBuild('c', 'pingPong', ['model/PingPong/Mapping.etmap', 'model/PingPong/PingPong.room'])
\ No newline at end of file
diff --git a/examples/org.eclipse.etrice.tutorials.cpp/build.gradle b/examples/org.eclipse.etrice.tutorials.cpp/build.gradle
new file mode 100644
index 000000000..f96b37bbf
--- /dev/null
+++ b/examples/org.eclipse.etrice.tutorials.cpp/build.gradle
@@ -0,0 +1,9 @@
+apply plugin: 'cpp'
+apply from: "$rootDir/gradle/etTest.gradle"
+
+dependencies {
+	modelpath_cpp files('model/HelloWorld', 'model/PingPong')
+}
+
+createBuild('cpp', 'helloWorld', ['model/HelloWorld/Mapping.etmap', 'model/HelloWorld/HelloWorld.room'])
+createBuild('cpp', 'pingPong', ['model/PingPong/Mapping.etmap', 'model/PingPong/PingPong.room'])
\ No newline at end of file
diff --git a/examples/org.eclipse.etrice.tutorials.java/build.gradle b/examples/org.eclipse.etrice.tutorials.java/build.gradle
new file mode 100644
index 000000000..a4f361688
--- /dev/null
+++ b/examples/org.eclipse.etrice.tutorials.java/build.gradle
@@ -0,0 +1,9 @@
+apply plugin: 'java-base'
+apply from: "$rootDir/gradle/etTest.gradle"
+
+dependencies {
+	modelpath_java files('model/HelloWorld', 'model/PingPong')
+}
+
+createBuild('java', 'helloWorld', ['model/HelloWorld/Mapping.etmap', 'model/HelloWorld/HelloWorld.room'])
+createBuild('java', 'pingPong', ['model/PingPong/Mapping.etmap', 'model/PingPong/PingPong.room'])
\ No newline at end of file
diff --git a/gradle/etGenerator.gradle b/gradle/etGenerator.gradle
index 423528b99..7f5d0ab3e 100644
--- a/gradle/etGenerator.gradle
+++ b/gradle/etGenerator.gradle
@@ -25,6 +25,7 @@ dependencies {
  * @param models: A list of models passed to the generator
  * @param genDir: The generation directory
  * @param options: The eTrice generator options
+ * @return the generator task
  */
 ext.createGeneratorTask = { name, lang, models, genDir = 'src-gen', options = [] ->
 	return tasks.create(name: name, type: JavaExec) {
diff --git a/gradle/etTest.gradle b/gradle/etTest.gradle
index af5bed904..909f69353 100644
--- a/gradle/etTest.gradle
+++ b/gradle/etTest.gradle
@@ -3,10 +3,14 @@ import static org.apache.tools.ant.taskdefs.condition.Os.*
 apply from: "$rootDir/gradle/etGenerator.gradle"
 apply from: "$rootDir/gradle/etUnitConverter.gradle"
 
-def outputDir = 'log'
-def srcGenDir = 'src-gen'
+dependencies {
+	modelpath_c project(path: ':runtime:org.eclipse.etrice.modellib.c', configuration: 'modelpath_c')
+	modelpath_cpp project(path: ':runtime:org.eclipse.etrice.modellib.cpp', configuration: 'modelpath_cpp')
+	modelpath_java project(path: ':runtime:org.eclipse.etrice.modellib.java', configuration: 'modelpath_java')
+}
 
-clean.delete srcGenDir, outputDir
+def outputDir = "$buildDir/log"
+def srcGenDir = "$buildDir/src-gen"
 
 def getMainClass(String genDir) {
 	// search for SubSystemRunner java file
@@ -21,31 +25,28 @@ def getMainClass(String genDir) {
 }
 
 /**
- * Creates all needed tasks for one test execution
- * @param lang: The eTrice generator type ('c', 'cpp', 'java')
- * @param name: The test name starting with a lower case letter
- * @param models: Models that are passed to the eTrice generator
- * @param options: Options that are passed to the eTrice generator
+ * Creates all needed tasks to build an etrice application
+ *
+ * @param lang the eTrice generator type ('c', 'cpp', 'java')
+ * @param name the name starting with a lower case letter
+ * @param models models that are passed to the eTrice generator
+ * @param options options that are passed to the eTrice generator
+ * @return the task to run the application
  */
-ext.createTest = { lang, name, models, options = [] ->
-
+ext.createBuild = { lang, name, models, options = [] ->
+	
 	def nameCap = name.capitalize()
-	def langCap = lang.capitalize()
-	def testName = "$name$langCap"
-	def testNameCap = testName.capitalize()
-	def suiteName = "${project.name}.$testNameCap"
-	def genDir = "$srcGenDir/$testName"
-	def workingDir = "$outputDir/$testName"
-	def etuFile = "$workingDir/log/${nameCap}.etu"
+	def genDir = "$srcGenDir/$name"
+	def workingDir = "$outputDir/$name"
 	
-	def generateTask = createGeneratorTask("generate$testNameCap", lang, models, genDir, options)
+	def generateTask = createGeneratorTask("generate$nameCap", lang, models, genDir, options)
 		
 	def runTask
 	
 	if(lang == 'c' || lang == 'cpp') {
 		model {
 			components {
-				"$testName"(NativeExecutableSpec) {
+				"$name"(NativeExecutableSpec) {
 					sources."$lang" {
 						builtBy generateTask
 						source {
@@ -63,14 +64,15 @@ ext.createTest = { lang, name, models, options = [] ->
 						cCompiler.args '-g3', '-std=c99'
 						cppCompiler.args '-g3', '-std=c99'
 						if(isFamily(FAMILY_UNIX)) { linker.args '-lpthread', '-lrt', '-lm' }
+						else if(isFamily(FAMILY_WINDOWS)) { linker.args '-lws2_32' }
 					}
 				}
 			}
 		}
 		
-		def exeFile = "$buildDir/exe/$testName/$testName"
-		runTask = tasks.create(name: "run$testNameCap", type: Exec) {
-			dependsOn "${testName}Executable"
+		def exeFile = "$buildDir/exe/$name/$name"
+		runTask = tasks.create(name: "run$nameCap", type: Exec) {
+			dependsOn "${name}Executable"
 			executable = exeFile
 			args '-run_as_test'
 			it.workingDir = workingDir
@@ -88,8 +90,9 @@ ext.createTest = { lang, name, models, options = [] ->
 		}
 		
 		tasks.getByName("compile${nameCap}Java").dependsOn generateTask
+		build.dependsOn "${name}Classes"
 		
-		runTask = tasks.create(name: "run$testNameCap", type: JavaExec) {
+		runTask = tasks.create(name: "run$nameCap", type: JavaExec) {
 			dependsOn "${name}Classes"
 			classpath = testSourceSet.runtimeClasspath
 			args '-run_as_test'
@@ -100,6 +103,29 @@ ext.createTest = { lang, name, models, options = [] ->
 	}
 	
 	runTask.doFirst { file("$workingDir/log").mkdirs() }
+	return runTask
+}
+
+/**
+ * Creates all needed tasks for one test execution
+ *
+ * @param lang the eTrice generator type ('c', 'cpp', 'java')
+ * @param name the test name starting with a lower case letter
+ * @param models models that are passed to the eTrice generator
+ * @param options options that are passed to the eTrice generator
+ */
+ext.createTest = { lang, name, models, options = [] ->
+
+	def nameCap = name.capitalize()
+	def langCap = lang.capitalize()
+	def testName = "$name$langCap"
+	def testNameCap = testName.capitalize()
+	def suiteName = "${project.name}.$testNameCap"
+	def genDir = "$srcGenDir/$testName"
+	def workingDir = "$outputDir/$testName"
+	def etuFile = "$workingDir/log/${nameCap}.etu"
+		
+	def runTask = createBuild(lang, testName, models, options)
 	
 	def convertTask = createEtUnitConverterTask("convert$testNameCap", [etuFile], ['-suite', suiteName])
 	convertTask.dependsOn runTask
diff --git a/plugins/org.eclipse.etrice.ui.runtime/create_contents.xml b/plugins/org.eclipse.etrice.ui.runtime/create_contents.xml
index 25f2d4910..8ed6a72f0 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/create_contents.xml
+++ b/plugins/org.eclipse.etrice.ui.runtime/create_contents.xml
@@ -15,7 +15,7 @@
 		<attribute name="source" default="default" />
 		<sequential>
 			<delete file="${target}/@{name}.zip" />
-			<zip destfile="${target}/@{name}.zip" basedir="@{source}/@{name}" excludes="pom.xml,bin/**,Debug/**,Release/**,*.cspec,jgen_*,target/**,WindowsMinGW/**,LinuxPosix/**,build/**"  />
+			<zip destfile="${target}/@{name}.zip" basedir="@{source}/@{name}" excludes="pom.xml,build.gradle,bin/**,Debug/**,Release/**,*.cspec,jgen_*,target/**,WindowsMinGW/**,LinuxPosix/**,build/**"  />
 			<echo message="zipped ${target}/@{name}.zip" />
 		</sequential>
 	</macrodef>
diff --git a/runtime/org.eclipse.etrice.modellib.c/build.gradle b/runtime/org.eclipse.etrice.modellib.c/build.gradle
index bc3d86cc8..11154ec58 100644
--- a/runtime/org.eclipse.etrice.modellib.c/build.gradle
+++ b/runtime/org.eclipse.etrice.modellib.c/build.gradle
@@ -15,7 +15,9 @@ def models = [
 	'model/etrice/api/contracts/monitors.room'
 ]
 
-createGeneratorTask('generate', 'c', models, 'src-gen', '-lib')
+def genDir = "$buildDir/src-gen"
+
+createGeneratorTask('generate', 'c', models, genDir, '-lib')
 
 model {
 	components {
@@ -23,11 +25,11 @@ model {
 			sources.c {
 				builtBy generate
 				source {
-					srcDirs = ['src-gen']
+					srcDirs = [genDir]
 					include '**/*.c'
 				}
 				exportedHeaders {
-					srcDirs = ['src-gen']
+					srcDirs = [genDir]
 				}
 				lib project: ':runtime:org.eclipse.etrice.runtime.c', library: 'etrice_runtime_c', linkage: 'api'
 			}
@@ -39,9 +41,12 @@ model {
 	}
 }
 
-clean.delete 'src-gen'
+task syncGenDir(type: Sync, dependsOn: generate) {
+	from genDir
+	into 'src-gen'
+}
 
-task zipModellib(type: Zip, dependsOn: generate) {
+task zipModellib(type: Zip, dependsOn: syncGenDir) {
     archiveName = project.name + "-${version}.zip"
     destinationDir = buildDir
     from projectDir
diff --git a/runtime/org.eclipse.etrice.modellib.cpp/build.gradle b/runtime/org.eclipse.etrice.modellib.cpp/build.gradle
index ef446f957..02172f4d3 100644
--- a/runtime/org.eclipse.etrice.modellib.cpp/build.gradle
+++ b/runtime/org.eclipse.etrice.modellib.cpp/build.gradle
@@ -10,7 +10,9 @@ def models = [
 	'model/etrice/api/timer.room'
 ]
 
-createGeneratorTask('generate', 'cpp', models, 'src-gen', '-lib')
+def genDir = "$buildDir/src-gen"
+
+createGeneratorTask('generate', 'cpp', models, genDir, '-lib')
 
 model {
 	components {
@@ -18,11 +20,11 @@ model {
 			sources.cpp {
 				builtBy generate
 				source {
-					srcDirs = ['src-gen']
+					srcDirs = [genDir]
 					include '**/*.cpp'
 				}
 				exportedHeaders {
-					srcDirs = ['src-gen']
+					srcDirs = [genDir]
 				}
 				lib project: ':runtime:org.eclipse.etrice.runtime.cpp', library: 'etrice_runtime_cpp', linkage: 'api'
 				lib project: ':runtime:org.eclipse.etrice.runtime.c', library: 'etrice_runtime_c', linkage: 'api'
@@ -33,6 +35,4 @@ model {
 			}
 		}
 	}
-}
-
-clean.delete 'src-gen'
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/runtime/org.eclipse.etrice.modellib.java/build.gradle b/runtime/org.eclipse.etrice.modellib.java/build.gradle
index 029d0e8ae..6d447774a 100644
--- a/runtime/org.eclipse.etrice.modellib.java/build.gradle
+++ b/runtime/org.eclipse.etrice.modellib.java/build.gradle
@@ -5,6 +5,8 @@ apply from: "$rootDir/gradle/etGenerator.gradle"
 
 dependencies {
 	modelpath_java files('model')
+	
+	compile project(':runtime:org.eclipse.etrice.runtime.java')
 }
 
 def models = [
@@ -14,14 +16,12 @@ def models = [
 	'model/etrice/api/contracts/monitors.room'
 ]
 
-dependencies {
-	compile project(':runtime:org.eclipse.etrice.runtime.java')
-}
+def genDir = "$buildDir/src-gen"
 
 sourceSets {
 	main {
 		java {
-			srcDirs = ['src-gen']
+			srcDirs = [genDir]
 		}
 		resources {
             srcDirs = [projectDir]
@@ -30,8 +30,5 @@ sourceSets {
 	}
 }
 
-createGeneratorTask('generate', 'java', models, 'src-gen', '-lib')
-
-compileJava.dependsOn generate
-
-clean.delete 'src-gen'
\ No newline at end of file
+createGeneratorTask('generate', 'java', models, genDir, '-lib')
+compileJava.dependsOn generate
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 668d060dc..272743d6f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -26,6 +26,14 @@ include	'plugins:org.eclipse.etrice.core.common',
 	'runtime:org.eclipse.etrice.runtime.cpp',
 	'runtime:org.eclipse.etrice.runtime.java',
 	
+	'examples:org.eclipse.etrice.examples.c',
+	'examples:org.eclipse.etrice.examples.java',
+	'examples:org.eclipse.etrice.template.c',
+	'examples:org.eclipse.etrice.template.cpp',
+	'examples:org.eclipse.etrice.tutorials.c',
+	'examples:org.eclipse.etrice.tutorials.cpp',
+	'examples:org.eclipse.etrice.tutorials.java',
+	
 	'tests:org.eclipse.etrice.runtime.c.tests',
 	'tests:org.eclipse.etrice.runtime.cpp.tests',
 	'tests:org.eclipse.etrice.runtime.java.tests',
diff --git a/tests/org.eclipse.etrice.generator.c.tests/build.gradle b/tests/org.eclipse.etrice.generator.c.tests/build.gradle
index 5b799cd8a..add6fc862 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/build.gradle
+++ b/tests/org.eclipse.etrice.generator.c.tests/build.gradle
@@ -3,7 +3,6 @@ apply plugin: 'c'
 apply from: "$rootDir/gradle/etTest.gradle"
 
 dependencies {
-	modelpath_c project(path: ':runtime:org.eclipse.etrice.modellib.c', configuration: 'modelpath_c')
 	modelpath_c files('models')
 }
 
diff --git a/tests/org.eclipse.etrice.generator.common.tests/build.gradle b/tests/org.eclipse.etrice.generator.common.tests/build.gradle
index 06fd90738..cdabcaf16 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/build.gradle
+++ b/tests/org.eclipse.etrice.generator.common.tests/build.gradle
@@ -5,9 +5,6 @@ apply plugin: 'java-base'
 apply from: "$rootDir/gradle/etTest.gradle"
 
 dependencies {
-	modelpath_c project(path: ':runtime:org.eclipse.etrice.modellib.c', configuration: 'modelpath_c')
-	modelpath_cpp project(path: ':runtime:org.eclipse.etrice.modellib.cpp', configuration: 'modelpath_cpp')
-	modelpath_java project(path: ':runtime:org.eclipse.etrice.modellib.java', configuration: 'modelpath_java')
 	modelpath_c files('models')
 	modelpath_cpp files('models')
 	modelpath_java files('models')
diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle b/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle
index 0b0612eb3..86ab5dbcc 100644
--- a/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle
+++ b/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle
@@ -3,7 +3,6 @@ apply plugin: 'cpp'
 apply from: "$rootDir/gradle/etTest.gradle"
 
 dependencies {
-	modelpath_cpp project(path: ':runtime:org.eclipse.etrice.modellib.cpp', configuration: 'modelpath_cpp')
 	modelpath_cpp files('models')
 }
 
diff --git a/tests/org.eclipse.etrice.generator.java.tests/build.gradle b/tests/org.eclipse.etrice.generator.java.tests/build.gradle
index 4354ebc93..43292b186 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/build.gradle
+++ b/tests/org.eclipse.etrice.generator.java.tests/build.gradle
@@ -3,7 +3,6 @@ apply plugin: 'java-base'
 apply from: "$rootDir/gradle/etTest.gradle"
 
 dependencies {
-	modelpath_java project(path: ':runtime:org.eclipse.etrice.modellib.java', configuration: 'modelpath_java')
 	modelpath_java files('models')
 }
 
@@ -11,7 +10,7 @@ def genericPhysical = '../org.eclipse.etrice.generator.common.tests/models/Gener
 
 createTest('java', 'sendingDataTest', ['models/SendingDataTest.room', genericPhysical])
 createTest('java', 'staticConfigTest', ['models/StaticConfigTest.etmap', 'models/StaticConfigTest.room', 'models/StaticConfigTest.config'])
-sourceSets.staticConfigTest.java.srcDir 'src/staticConfigTest'
+sourceSets.staticConfigTestJava.java.srcDir 'src/staticConfigTest'
 
 createTest('java', 'dynamicActorTest1', ['models/DynamicActorTest1.etmap', 'models/DynamicActorTest1.room'])
 createTest('java', 'dynamicActorTest2', ['models/DynamicActorTest2.etmap', 'models/DynamicActorTest2.room'])
@@ -24,11 +23,11 @@ createTest('java', 'tCPTest', ['models/TCPTest.room', genericPhysical])
 
 def genOptions = ['-persistable', '-storeDataObj']
 createTest('java', 'dynamicActorTest7', ['models/DynamicActorTest7.etmap', 'models/DynamicActorTest7.room'], genOptions)
-sourceSets.dynamicActorTest7.java.srcDir 'src/dynamicActorTest7'
+sourceSets.dynamicActorTest7Java.java.srcDir 'src/dynamicActorTest7'
 createTest('java', 'dynamicConfigTest', ['models/DynamicConfigTest.etmap', 'models/DynamicConfigTest.room', 'models/DynamicConfigTest.config'], genOptions)
-sourceSets.dynamicConfigTest.java.srcDir 'src/dynamicConfigTest'
+sourceSets.dynamicConfigTestJava.java.srcDir 'src/dynamicConfigTest'
 createTest('java', 'storeRestoreTest', ['models/StoreRestoreTest.room', genericPhysical], genOptions)
-sourceSets.storeRestoreTest.java.srcDir 'src/storeRestoreTest'
+sourceSets.storeRestoreTestJava.java.srcDir 'src/storeRestoreTest'
 
 task copyRTConfig(type: Copy) {
 	from 'models/DynamicConfigTest.rt-config'
diff --git a/tests/org.eclipse.etrice.runtime.c.tests/build.gradle b/tests/org.eclipse.etrice.runtime.c.tests/build.gradle
index 0d42b7a34..1c9537631 100644
--- a/tests/org.eclipse.etrice.runtime.c.tests/build.gradle
+++ b/tests/org.eclipse.etrice.runtime.c.tests/build.gradle
@@ -28,14 +28,13 @@ model {
 }
 
 def exeFile = "$buildDir/exe/etrice_runtime_c_tests/etrice_runtime_c_tests"
-def etuFileRuntimeTest = 'log/TestCRuntime.etu'
-def etuFileEtUnitTest = 'log/TestEtUnitSpecial.etu'
-
-clean.delete 'log'
+def etuFileRuntimeTest = "$buildDir/log/TestCRuntime.etu"
+def etuFileEtUnitTest = "$buildDir/log/TestEtUnitSpecial.etu"
 
 task run(type: Exec, dependsOn: assemble, group: 'verification') {
 	executable exeFile
-	doFirst { file('log').mkdirs() }
+	workingDir = buildDir
+	doFirst { file("$buildDir/log").mkdirs() }
 }
 
 createEtUnitConverterTask('convert', [etuFileRuntimeTest, etuFileEtUnitTest])
diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle b/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle
index e05a5bac0..cf51adaa3 100644
--- a/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle
+++ b/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle
@@ -29,13 +29,12 @@ model {
 }
 
 def exeFile = "$buildDir/exe/etrice_runtime_cpp_tests/etrice_runtime_cpp_tests"
-def etuFile = 'log/TestCppRuntime.etu'
-
-clean.delete 'log'
+def etuFile = "$buildDir/log/TestCppRuntime.etu"
 
 task run(type: Exec, dependsOn: assemble, group: 'verification') {
 	executable exeFile
-	doFirst { file('log').mkdirs() }
+	workingDir = buildDir
+	doFirst { file("$buildDir/log").mkdirs() }
 }
 
 createEtUnitConverterTask('convert', [etuFile])
diff --git a/tests/org.eclipse.etrice.runtime.java.tests/build.gradle b/tests/org.eclipse.etrice.runtime.java.tests/build.gradle
index 9491de183..643174f37 100644
--- a/tests/org.eclipse.etrice.runtime.java.tests/build.gradle
+++ b/tests/org.eclipse.etrice.runtime.java.tests/build.gradle
@@ -7,7 +7,6 @@ dependencies {
 
 sourceSets.test.java.srcDirs = ['src']
 
-test.reports.html.enabled = false
-test.reports.junitXml.destination = file('log')
-
-clean.delete 'log'
\ No newline at end of file
+test.workingDir = buildDir
+test.reports.junitXml.destination = file("$buildDir/log")
+test.reports.html.enabled = false
\ No newline at end of file
diff --git a/tests/pom.xml b/tests/pom.xml
index a6ea237a1..d6c30be48 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -32,7 +32,6 @@
 				<version>${tycho.version}</version>
 				<configuration>
 					<failIfNoTests>false</failIfNoTests>
-					<reportsDirectory>log</reportsDirectory>
 				</configuration>
 			</plugin>
 		</plugins>