Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJan Belle2019-08-28 17:52:35 -0400
committerJan Belle2019-08-29 04:25:31 -0400
commit8dfd6e0b7d9c4d0ff5a55b3654868eeda59bb188 (patch)
treed3fad7b549c8f4661c2dbca8ca44e7072de24199 /tests
parenta240b013c499665bc1601bc2353798be3a672828 (diff)
downloadorg.eclipse.etrice-8dfd6e0b7d9c4d0ff5a55b3654868eeda59bb188.tar.gz
org.eclipse.etrice-8dfd6e0b7d9c4d0ff5a55b3654868eeda59bb188.tar.xz
org.eclipse.etrice-8dfd6e0b7d9c4d0ff5a55b3654868eeda59bb188.zip
[examples] Add Gradle build for examples, tutorials, templates
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/build.gradle1
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/build.gradle3
-rw-r--r--tests/org.eclipse.etrice.generator.cpp.tests/build.gradle1
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/build.gradle9
-rw-r--r--tests/org.eclipse.etrice.runtime.c.tests/build.gradle9
-rw-r--r--tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle7
-rw-r--r--tests/org.eclipse.etrice.runtime.java.tests/build.gradle7
-rw-r--r--tests/pom.xml1
8 files changed, 14 insertions, 24 deletions
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>

Back to the top