Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJan Belle2017-09-17 15:00:32 +0000
committerJan Belle2017-09-17 15:00:32 +0000
commit216b91e9103d80043239ecda7052fecb0999b085 (patch)
tree0c2d2f573f6c5d498e183bce322fa06713d1718a /tests
parent26e553de11a137a1487074bce959a3b4423f2e1c (diff)
downloadorg.eclipse.etrice-216b91e9103d80043239ecda7052fecb0999b085.tar.gz
org.eclipse.etrice-216b91e9103d80043239ecda7052fecb0999b085.tar.xz
org.eclipse.etrice-216b91e9103d80043239ecda7052fecb0999b085.zip
cleaned up buildnewbuild
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/Makefile14
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/buckminster.cspec10
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/build.gradle2
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/make.xml100
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/org.eclipse.etrice.generator.c.tests make.xml.launch42
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/buckminster.cspec1
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/build.gradle2
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/common.xml217
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/etTest.gradle111
-rw-r--r--tests/org.eclipse.etrice.generator.cpp.tests/Makefile16
-rw-r--r--tests/org.eclipse.etrice.generator.cpp.tests/buckminster.cspec10
-rw-r--r--tests/org.eclipse.etrice.generator.cpp.tests/build.gradle2
-rw-r--r--tests/org.eclipse.etrice.generator.cpp.tests/make.xml122
-rw-r--r--tests/org.eclipse.etrice.generator.cpp.tests/org.eclipse.etrice.generator.cpp.tests make.xml.launch36
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/buckminster.cspec10
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/build.gradle2
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/make.xml129
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/org.eclipse.etrice.generator.java.tests make.xml.launch42
-rw-r--r--tests/org.eclipse.etrice.runtime.c.tests/Makefile13
-rw-r--r--tests/org.eclipse.etrice.runtime.c.tests/buckminster.cspec10
-rw-r--r--tests/org.eclipse.etrice.runtime.c.tests/build.gradle2
-rw-r--r--tests/org.eclipse.etrice.runtime.c.tests/make.xml68
-rw-r--r--tests/org.eclipse.etrice.runtime.c.tests/org.eclipse.etrice.runtime.c.tests make.xml.launch41
-rw-r--r--tests/org.eclipse.etrice.runtime.cpp.tests/Makefile14
-rw-r--r--tests/org.eclipse.etrice.runtime.cpp.tests/buckminster.cspec10
-rw-r--r--tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle2
-rw-r--r--tests/org.eclipse.etrice.runtime.cpp.tests/make.xml68
-rw-r--r--tests/org.eclipse.etrice.runtime.cpp.tests/org.eclipse.etrice.runtime.cpp.tests make.xml.launch38
-rw-r--r--tests/org.eclipse.etrice.runtime.java.tests/buckminster.cspec6
-rw-r--r--tests/pom.xml3
30 files changed, 7 insertions, 1136 deletions
diff --git a/tests/org.eclipse.etrice.generator.c.tests/Makefile b/tests/org.eclipse.etrice.generator.c.tests/Makefile
deleted file mode 100644
index 9a1750a43..000000000
--- a/tests/org.eclipse.etrice.generator.c.tests/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# for make.xml
-
-#include ${MODELLIB_ROOTDIR}/buildTools/modellib.mk
-include ${RUNTIME_ROOTDIR}/buildTools/runtime.mk
-
-# ---
-IN_TARGET := ${APP_TARGET}
-IN_BUILD_DIR := ${APP_BUILD_DIR}
-IN_INCDIRS += ${APP_SRCDIRS_REC}
-IN_SRCDIRS_REC += ${APP_SRCDIRS_REC}
-#---
-
-# Create rules
-include ${RUNTIME_ROOTDIR}/buildTools/Makefile.mk \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.generator.c.tests/buckminster.cspec b/tests/org.eclipse.etrice.generator.c.tests/buckminster.cspec
deleted file mode 100644
index c3cb872da..000000000
--- a/tests/org.eclipse.etrice.generator.c.tests/buckminster.cspec
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.generator.c.tests" componentType="buckminster" version="0.5.0.qualifier">
- <cs:actions>
- <cs:public name="run_tests" actor="ant">
- <cs:actorProperties>
- <cs:property key="buildFile" value="make.xml"/>
- <cs:property key="targets" value="all"/>
- </cs:actorProperties>
- </cs:public>
- </cs:actions>
-</cs:cspec> \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.generator.c.tests/build.gradle b/tests/org.eclipse.etrice.generator.c.tests/build.gradle
index f706476a9..e5ed184c3 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/build.gradle
+++ b/tests/org.eclipse.etrice.generator.c.tests/build.gradle
@@ -2,7 +2,7 @@ plugins {
id 'c'
}
-apply from: etTest
+apply from: "$rootDir/gradle/etTest.gradle"
def genericPhysical = '../org.eclipse.etrice.generator.common.tests/models/GenericPhysical.etphys'
diff --git a/tests/org.eclipse.etrice.generator.c.tests/make.xml b/tests/org.eclipse.etrice.generator.c.tests/make.xml
deleted file mode 100644
index 07e2df06e..000000000
--- a/tests/org.eclipse.etrice.generator.c.tests/make.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Ant makefile for building and running of tests.
-
- Includes common.xml from org.eclipse.etrice.generator.common.tests
--->
-<project name="org.eclipse.etrice.generator.c.tests" basedir="." default="all">
-
- <target name="testing" depends="common.testing">
-
- <!-- add test here, testid==testSuiteFileName -->
- <test testid="StaticConfigTest" models="${models.path}/staticConfig/StaticConfigTest.etmap ${models.path}/staticConfig/StaticConfigTest.room ${models.path}/staticConfig/StaticConfigTest.config ${models.path}/TimingService.room" />
-
- <!-- fail on build server -->
- <!--<test testid="SendingDataTestC" models="${models.path}/sendingData/SendingDataTestC.room ${models.path}/GenericPhysical.etphys" />-->
- <echo>done with ${ant.project.name}</echo>
- </target>
-
- <target name="copyModels" depends="common.copyModels">
- <copy todir="${models.path}">
- <fileset dir="./targetModels"/>
- </copy>
- <move file="${models.path}/staticConfig/StaticConfigTest_C.room" toFile="${models.path}/staticConfig//StaticConfigTest.room" />
- </target>
-
- <!-- ################################################################ -->
-
- <import file="../org.eclipse.etrice.generator.common.tests/common.xml" as="common"/>
-
- <property name="modellib.path" value="../../runtime/org.eclipse.etrice.modellib.c" />
- <property name="runtime.path" value="../../runtime/org.eclipse.etrice.runtime.c" />
-
- <target name="set_local_rt" unless="runtime.platform">
- <!-- <property name="runtime.platform" value="MT_POSIX_GENERIC_GCC"/> -->
- <property name="runtime.platform" value="MT_WIN_MinGW"/>
- <echo> runtime.platform = ${runtime.platform} </echo>
- </target>
- <target name="setVars" depends="set_local_rt,common.setVars"/>
-
- <target name="all" depends="clean,copyModels,testing"></target>
-
- <!-- test := generate 1 executable, build, run, process results -->
- <macrodef name="test">
- <attribute name="testId"/>
- <attribute name="models"/>
- <sequential>
- <standaloneGenerator testId="@{testId}" models="@{models}"/>
- <build testId="@{testId}"/>
- <run testId="@{testId}"/>
- <convert testId="@{testId}"/>
- <copyResult testId="@{testId}" targetId="C_${runtime.platform}_"/>
- </sequential>
- </macrodef>
-
- <macrodef name="standaloneGenerator">
- <attribute name="testId"/>
- <attribute name="models"/>
- <sequential>
- <mkdir dir="${output}"/>
- <java output="${output}/generate.txt" error="${output}/generate_err.txt" classname="org.eclipse.etrice.generator.c.Main" fork="true" failonerror="true">
- <arg line="@{models}"/>
- <arg value="-genDir"/><arg value="src-gen/@{testId}"/>
- <arg value="-msc_instr"/>
- <classpath refid="etrice.clspath"/>
- </java>
- </sequential>
- </macrodef>
-
- <!--
- build: compiles and links the generated C sources
- -->
- <macrodef name="build">
- <attribute name="testId"/>
- <sequential>
- <mkdir dir="${bin.path}"/>
- <mkdir dir="${output}"/>
- <exec executable="make" failonerror="true" output="${output}/build.txt">
- <arg line="all"/>
- <arg line="APP_TARGET=@{testId}.exe"/>
- <arg line="APP_BUILD_DIR=${bin.path}"/>
- <arg line="APP_SRCDIRS_REC='./src-gen/@{testId} ./src/@{testId}'"/>
- <arg line="RUNTIME_ROOTDIR=${runtime.path}"/>
- <arg line="MODELLIB_ROOTDIR=${modellib.path}"/>
- <arg line="TARGET_PLATFORM=${runtime.platform}"/>
- </exec>
- </sequential>
- </macrodef>
-
- <macrodef name="run">
- <attribute name="testId"/>
- <sequential>
- <mkdir dir="${output}"/>
- <mkdir dir="${testlog.path}"/>
- <exec dir="./" output="${output}/run.txt" resolveexecutable="true" executable="${bin.path}/@{testId}.exe" timeout="${run.msTimout}">
- <arg value="-run_as_test"/>
- </exec>
- </sequential>
- </macrodef>
-
-</project>
diff --git a/tests/org.eclipse.etrice.generator.c.tests/org.eclipse.etrice.generator.c.tests make.xml.launch b/tests/org.eclipse.etrice.generator.c.tests/org.eclipse.etrice.generator.c.tests make.xml.launch
deleted file mode 100644
index 92ce070b0..000000000
--- a/tests/org.eclipse.etrice.generator.c.tests/org.eclipse.etrice.generator.c.tests make.xml.launch
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.etrice.generator.c.tests/make.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.generator.c.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">
-<mapEntry key="eclipse.home" value="${eclipse_home}"/>
-<mapEntry key="eclipse.pdebuild.home" value="${target_platform_plugin_location:org.eclipse.pde.build}"/>
-<mapEntry key="eclipse.pdebuild.scripts" value="${target_platform_plugin_location:org.eclipse.pde.build}/scripts/"/>
-<mapEntry key="eclipse.pdebuild.templates" value="${target_platform_plugin_location:org.eclipse.pde.build}/templates/"/>
-<mapEntry key="eclipse.running" value="true"/>
-<mapEntry key="com.google.guava" value="${target_platform_plugin_location:com.google.guava}"/>
-<mapEntry key="com.google.inject" value="${target_platform_plugin_location:com.google.inject}"/>
-<mapEntry key="javax.inject" value="${target_platform_plugin_location:javax.inject}"/>
-<mapEntry key="org.antlr.runtime" value="${target_platform_plugin_location:org.antlr.runtime}"/>
-<mapEntry key="org.apache.log4j" value="${target_platform_plugin_location:org.apache.log4j}"/>
-<mapEntry key="org.eclipse.emf.common" value="${target_platform_plugin_location:org.eclipse.emf.common}"/>
-<mapEntry key="org.eclipse.emf.ecore" value="${target_platform_plugin_location:org.eclipse.emf.ecore}"/>
-<mapEntry key="org.eclipse.emf.ecore.xmi" value="${target_platform_plugin_location:org.eclipse.emf.ecore.xmi}"/>
-<mapEntry key="org.eclipse.equinox.common" value="${target_platform_plugin_location:org.eclipse.equinox.common}"/>
-<mapEntry key="org.eclipse.xtend.lib" value="${target_platform_plugin_location:org.eclipse.xtend.lib}"/>
-<mapEntry key="org.eclipse.xtext" value="${target_platform_plugin_location:org.eclipse.xtext}"/>
-<mapEntry key="org.eclipse.xtext.common.types" value="${target_platform_plugin_location:org.eclipse.xtext.common.types}"/>
-<mapEntry key="org.eclipse.xtext.util" value="${target_platform_plugin_location:org.eclipse.xtext.util}"/>
-<mapEntry key="org.eclipse.xtext.xbase.lib" value="${target_platform_plugin_location:org.eclipse.xtext.xbase.lib}"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.etrice.generator.c.tests/make.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-v"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/tests/org.eclipse.etrice.generator.common.tests/buckminster.cspec b/tests/org.eclipse.etrice.generator.common.tests/buckminster.cspec
deleted file mode 100644
index b9bd37b93..000000000
--- a/tests/org.eclipse.etrice.generator.common.tests/buckminster.cspec
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.generator.common.tests" componentType="buckminster" version="0.5.0.qualifier"/>
diff --git a/tests/org.eclipse.etrice.generator.common.tests/build.gradle b/tests/org.eclipse.etrice.generator.common.tests/build.gradle
index 8e6530812..9fd487354 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/build.gradle
+++ b/tests/org.eclipse.etrice.generator.common.tests/build.gradle
@@ -4,7 +4,7 @@ plugins {
id 'java-base'
}
-apply from: etTest
+apply from: "$rootDir/gradle/etTest.gradle"
def genericPhysical = 'models/GenericPhysical.etphys'
diff --git a/tests/org.eclipse.etrice.generator.common.tests/common.xml b/tests/org.eclipse.etrice.generator.common.tests/common.xml
deleted file mode 100644
index 63b4ab7d3..000000000
--- a/tests/org.eclipse.etrice.generator.common.tests/common.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0"?>
-<project name="org.eclipse.etrice.generator.common.tests">
-
- <target name="testing" depends="copyModels">
-
- <!-- add test here, testid==testSuiteFileName -->
- <test testid="ActorCommunicationTest" models="${models.path}/ActorCommunicationTest.room ${models.path}/GenericPhysical.etphys ${models.path}/TimingService.room" />
- <test testid="ChoicePointTest" models="${models.path}/ChoicePointTest.room ${models.path}/GenericPhysical.etphys" />
- <test testid="ChoicePointTestExtended" models="${models.path}/ChoicePointTestExtended.room ${models.path}/GenericPhysical.etphys" />
- <test testid="DataDrivenTest" models="${models.path}/DataDrivenTest.room ${models.path}/GenericPhysical.etphys ${models.path}/TimingService.room" />
- <test testid="EnumTest" models="${models.path}/EnumTest.room ${models.path}/GenericPhysical.etphys" />
- <test testid="CompileTests" models="${models.path}/CompileTests.room ${models.path}/GenericPhysical.etphys ${models.path}/DetailExpressionTest.room ${models.path}/StatemachineInterfaceTest.room ${models.path}/StatemachineInterfaceInheritedTest.room ${models.path}/StatemachineInterfaceTest.room ${models.path}/ContinuationTransitionTest.room ${models.path}/TimingService.room" />
- <test testid="HandlerTest" models="${models.path}/HandlerTest.room ${models.path}/GenericPhysical.etphys" />
- <test testid="OperationInheritanceTest" models="${models.path}/OperationInheritanceTest.room ${models.path}/GenericPhysical.etphys" />
- <test testid="PingPongThreadTest" models="${models.path}/PingPongThreadTest.etmap ${models.path}/PingPongThreadTest.room ${models.path}/TimingService.room" />
- <test testid="PingPongThreadReplPortTest" models="${models.path}/PingPongThreadReplPortTest.etmap ${models.path}/PingPongThreadReplPortTest.room ${models.path}/TimingService.room" />
-
-
- <echo>done with ${ant.project.name}</echo>
- </target>
-
- <target name="copyModels" depends="setVars">
- <copy todir="${models.path}">
- <fileset dir="../org.eclipse.etrice.generator.common.tests/models"/>
- </copy>
- <copy todir="${models.path}" >
- <fileset dir="${modellib.path}/model">
- <include name="*.room"/>
- <include name="*.etphys"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ################################################################ -->
-
- <!-- global properties -->
- <!-- test.results, target.platform -->
-
- <!-- private properties-->
- <property name="models.path" value="./models"/>
- <property name="testlog.path" value="./log/testlog"/>
- <property name="output" value="./output"/>
- <property name="bin.path" value="./bin"/>
-
- <property name="run.msTimout" value="5000"/>
-
- <!-- show ALL used variables -->
- <target name="showVars">
- <echo> ant.project.name = ${ant.project.name} </echo>
- <echo> runtime.path = ${runtime.path} </echo>
- <echo> testlog.path = ${testlog.path} </echo>
- <echo> test.results = ${test.results} </echo>
- <echo> output = ${output} </echo>
- <echo> bin.path = ${bin.path} </echo>
- <echo> target.platform = ${target.platform} </echo>
- <echo> modellib.path = ${modellib.path} </echo>
- <echo> models.path = ${models.path} </echo>
- <echo> basedir = ${basedir} </echo>
-
- <echo> org.eclipse.emf.ecore = ${org.eclipse.emf.ecore} </echo>
- <echo> org.eclipse.emf.common = ${org.eclipse.emf.common} </echo>
- <echo> org.eclipse.emf.ecore.xmi = ${org.eclipse.emf.ecore.xmi} </echo>
- <echo> com.google.inject = ${com.google.inject} </echo>
- <echo> com.google.guava = ${com.google.guava} </echo>
- <echo> org.eclipse.equinox.common = ${org.eclipse.equinox.common} </echo>
- <echo> org.eclipse.xtext = ${org.eclipse.xtext} </echo>
- <echo> org.eclipse.xtext.util = ${org.eclipse.xtext.util} </echo>
- <echo> org.eclipse.xtext.common.types = ${org.eclipse.xtext.common.types} </echo>
- <echo> org.eclipse.xtend.lib = ${org.eclipse.xtend.lib} </echo>
- <echo> org.eclipse.xtext.xbase.lib = ${org.eclipse.xtext.xbase.lib} </echo>
- <echo> org.apache.log4j = ${org.apache.log4j} </echo>
- <echo> org.antlr.runtime = ${org.antlr.runtime} </echo>
- <echo> javax.inject = ${javax.inject} </echo>
-
- <pathconvert property="classpathProp" refid="etrice.clspath"/>
- <echo> etrice.clspath = ${classpathProp} </echo>
- </target>
-
- <!-- set global properties if not set-->
- <target name="set_local_tr" unless="test.results">
- <property name="test.results" value="./results"/>
- </target>
- <target name="set_local_tp" unless="target.platform">
- <property name="target.platform" value="${eclipse.home}"/>
- </target>
-
- <target name="setVars" depends="set_local_tp,set_local_tr,set_etrice_clspath,showVars"/>
-
- <target name="set_etrice_clspath">
- <path id="etrice.clspath">
- <pathelement location="../../plugins/org.eclipse.etrice.generator.c/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.generator.java/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.generator.cpp/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.etunit.converter/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.generator.config/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.generator.doc/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.generator.fsm/bin" />
- <pathelement location="../../plugins/org.eclipse.etrice.generator/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.generator.gnuplot/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.core.common/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.core.fsm/bin" />
- <pathelement location="../../plugins/org.eclipse.etrice.core.room/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.core.etphys/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.core.etmap/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.core.config/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.core.genmodel.fsm/bin" />
- <pathelement location="../../plugins/org.eclipse.etrice.core.genmodel/bin"/>
-
- <!-- resolve dependencies using Oomph util in properties of launch config -->
- <pathelement location="${org.eclipse.emf.ecore}"/>
- <pathelement location="${org.eclipse.emf.common}"/>
- <pathelement location="${org.eclipse.emf.ecore.xmi}"/>
- <pathelement location="${com.google.inject}"/>
- <pathelement location="${com.google.guava}"/>
- <pathelement location="${org.eclipse.equinox.common}"/>
- <pathelement location="${org.eclipse.xtext}"/>
- <pathelement location="${org.eclipse.xtext.util}"/>
- <pathelement location="${org.eclipse.xtext.common.types}"/>
- <pathelement location="${org.eclipse.xtend.lib}"/>
- <pathelement location="${org.eclipse.xtext.xbase.lib}"/>
- <pathelement location="${org.apache.log4j}"/>
- <pathelement location="${org.antlr.runtime}"/>
- <pathelement location="${javax.inject}"/>
-
- <!-- resolve if used from Buckminster Ant task -->
- <fileset dir="${target.platform}/plugins/">
- <include name="org.eclipse.emf.ecore_2.1*.jar" />
- <include name="org.eclipse.emf.common_2.1*.jar" />
- <include name="org.eclipse.emf.ecore.xmi_2.1*.jar" />
- <include name="com.google.inject_*.jar" />
- <include name="com.google.guava_1*.jar" />
- <include name="org.eclipse.equinox.common_3.*.jar" />
- <include name="org.apache.log4j_1.2*.jar" />
- <include name="org.antlr.runtime_3.2*.jar" />
- <include name="javax.inject_1.0*.jar" />
-
- <!-- Xtext 2.6 -->
- <include name="org.eclipse.xtext_2.6*.jar" />
- <include name="org.eclipse.xtext.util_2.6*.jar" />
- <include name="org.eclipse.xtext.common.types_2.6*.jar" />
- <include name="org.eclipse.xtend.lib_2.6*.jar" />
- <include name="org.eclipse.xtext.xbase.lib_2.6*.jar" />
-
- <!-- Xtext 2.7 -->
- <include name="org.eclipse.xtext_2.7*.jar" />
- <include name="org.eclipse.xtext.util_2.7*.jar" />
- <include name="org.eclipse.xtext.common.types_2.7*.jar" />
- <include name="org.eclipse.xtend.lib_2.7*.jar" />
- <include name="org.eclipse.xtext.xbase.lib_2.7*.jar" />
-
- <!-- Xtext 2.8 -->
- <include name="org.eclipse.xtext_2.8*.jar" />
- <include name="org.eclipse.xtext.util_2.8*.jar" />
- <include name="org.eclipse.xtext.common.types_2.8*.jar" />
- <include name="org.eclipse.xtend.lib_2.8*.jar" />
- <include name="org.eclipse.xtext.xbase.lib_2.8*.jar" />
-
- <!-- Xtext 2.10 -->
- <include name="org.eclipse.xtext_2.10*.jar" />
- <include name="org.eclipse.xtext.util_2.10*.jar" />
- <include name="org.eclipse.xtext.common.types_2.10*.jar" />
- <include name="org.eclipse.xtend.lib_2.10*.jar" />
- <include name="org.eclipse.xtext.xbase.lib_2.10*.jar" />
- </fileset>
- </path>
- </target>
-
- <!--
- clean: deletes all folders created by this script
- -->
- <target name="clean" depends="setVars">
- <delete dir="${testlog.path}"/>
- <!--deletes resulst from other script on server <delete dir="${test.results}"/>-->
- <delete dir="${output}"/>
- <delete dir="${bin.path}"/>
- <delete dir="${models.path}"/>
- <delete dir="log"/>
- <delete dir="src-gen"/>
- </target>
-
- <macrodef name="convert">
- <attribute name="testId"/>
- <sequential>
- <java output="${output}/convert.txt" append="true" classname="org.eclipse.etrice.etunit.converter.EtUnitReportConverter" fork="true" failonerror="true">
- <arg value="-suite"/>
- <arg value="${ant.project.name}.@{testId}"/>
- <arg value="${testlog.path}/@{testId}.etu"/>
- <classpath refid="etrice.clspath"/>
- </java>
- </sequential>
- </macrodef>
-
- <macrodef name="convertPre">
- <attribute name="testId"/>
- <sequential>
- <java output="${output}/convert.txt" append="true" classname="org.eclipse.etrice.etunit.converter.EtUnitReportConverter" fork="true" failonerror="true">
- <arg value="-presuite"/>
- <arg value="${ant.project.name}."/>
- <arg value="${testlog.path}/@{testId}.etu"/>
- <classpath refid="etrice.clspath"/>
- </java>
- </sequential>
- </macrodef>
-
- <!--
- copy_results: copies the *.xml results to their final destination
- -->
- <macrodef name="copyResult">
- <attribute name="testId"/>
- <attribute name="targetId" default=""/>
- <sequential>
- <mkdir dir="${test.results}"/>
- <move file="${testlog.path}/@{testId}.xml" tofile="${test.results}/@{targetId}@{testId}.xml"/>
- </sequential>
- </macrodef>
-
-</project> \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.generator.common.tests/etTest.gradle b/tests/org.eclipse.etrice.generator.common.tests/etTest.gradle
deleted file mode 100644
index 544b6f8f0..000000000
--- a/tests/org.eclipse.etrice.generator.common.tests/etTest.gradle
+++ /dev/null
@@ -1,111 +0,0 @@
-import static org.apache.tools.ant.taskdefs.condition.Os.*
-
-apply from: etGenerator
-apply from: etUnitConverter
-
-def outputDir = 'log'
-def srcGenDir = 'src-gen'
-
-clean.delete srcGenDir, outputDir
-
-def getMainClass(String genDir) {
- // search for SubSystemRunner java file
- def mainFile = fileTree(genDir, { include '**/*Runner.java' }).getSingleFile()
- // relativize path to generation directory
- def relPath = file(genDir).toPath().relativize(mainFile.toPath()).normalize().toString()
- // remove '.java' at the end
- def path = relPath.substring(0, relPath.length() - 5)
- // replace all separators with '.'
- def mainClass = path.replace(File.separatorChar, '.' as char)
- return mainClass
-}
-
-/**
- * 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 generateTask = createGeneratorTask("generate$testNameCap", lang, models, genDir, options)
- generateTask.environment 'etModellib', "org.eclipse.etrice.modellib.$lang"
-
- def runTask
-
- if(lang == 'c' || lang == 'cpp') {
- model {
- components {
- "$testName"(NativeExecutableSpec) {
- sources."$lang" {
- builtBy generateTask
- source {
- srcDirs = [genDir]
- include "**/*.$lang"
- }
- exportedHeaders {
- srcDirs = [genDir]
- }
- lib project: ":runtime:org.eclipse.etrice.modellib.$lang", library: "etrice_modellib_$lang", linkage: 'static'
- if(lang == 'cpp') lib project: ':runtime:org.eclipse.etrice.runtime.cpp', library: 'etrice_runtime_cpp', linkage: 'static'
- lib project: ':runtime:org.eclipse.etrice.runtime.c', library: 'etrice_runtime_c', linkage: 'static'
- }
- binaries.all {
- cCompiler.args '-g3'
- cppCompiler.args '-g3'
- if(isFamily(FAMILY_UNIX)) { linker.args '-lpthread', '-lrt', '-lm' }
- }
- }
- }
- }
-
- def exeFile = "$buildDir/exe/$testName/$testName"
- runTask = tasks.create(name: "run$testNameCap", type: Exec) {
- dependsOn "${testName}Executable"
- commandLine exeFile, '-run_as_test'
- inputs.file exeFile
- outputs.file etuFile
- it.workingDir = workingDir
- }
- }
-
- else if(lang == 'java') {
- def testSourceSet = sourceSets.create(name) {
- java.srcDirs = [genDir]
- }
-
- dependencies {
- add "${name}Compile", project(':runtime:org.eclipse.etrice.modellib.java')
- add "${name}Compile", project(':runtime:org.eclipse.etrice.runtime.java')
- }
-
- tasks.getByName("compile${nameCap}Java").dependsOn generateTask
-
- runTask = tasks.create(name: "run$testNameCap", type: JavaExec) {
- dependsOn "${name}Classes"
- classpath = testSourceSet.runtimeClasspath
- args '-run_as_test'
- outputs.file etuFile
- it.workingDir = workingDir
-
- doFirst { main = getMainClass(genDir) }
- }
- }
-
- runTask.doFirst { file("$workingDir/log").mkdirs() }
-
- def convertTask = createEtUnitConverterTask("convert$testNameCap", [etuFile], ['-suite', suiteName])
- convertTask.dependsOn runTask
-
- check.dependsOn tasks.create(name: testName, dependsOn: convertTask, group: 'verification')
-}
diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/Makefile b/tests/org.eclipse.etrice.generator.cpp.tests/Makefile
deleted file mode 100644
index b6b863770..000000000
--- a/tests/org.eclipse.etrice.generator.cpp.tests/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# for make.xml
-
-#include ${CPP_MODELLIB_ROOTDIR}/buildTools/modellib.mk
-include ${CPP_RUNTIME_ROOTDIR}/buildTools/runtime.mk
-
-# ---
-IN_TARGET := ${APP_TARGET}
-IN_BUILD_DIR := ${APP_BUILD_DIR}
-IN_INCDIRS += ${APP_SRCDIRS_REC}
-IN_SRCDIRS_REC += ${APP_SRCDIRS_REC}
-CC = ${CXX}
-IN_CFLAGS += -std=c++98 -O0 -g3 -pedantic -Wall
-#---
-
-# Create rules
-include ${RUNTIME_ROOTDIR}/buildTools/Makefile.mk \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/buckminster.cspec b/tests/org.eclipse.etrice.generator.cpp.tests/buckminster.cspec
deleted file mode 100644
index 39f8c66f3..000000000
--- a/tests/org.eclipse.etrice.generator.cpp.tests/buckminster.cspec
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.generator.cpp.tests" componentType="buckminster" version="0.5.0.qualifier">
- <cs:actions>
- <cs:public name="run_tests" actor="ant">
- <cs:actorProperties>
- <cs:property key="buildFile" value="make.xml"/>
- <cs:property key="targets" value="all"/>
- </cs:actorProperties>
- </cs:public>
- </cs:actions>
-</cs:cspec>
diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle b/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle
index 1860582d3..aede47920 100644
--- a/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle
+++ b/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle
@@ -2,7 +2,7 @@ plugins {
id 'cpp'
}
-apply from: etTest
+apply from: "$rootDir/gradle/etTest.gradle"
def genericPhysical = '../org.eclipse.etrice.generator.common.tests/models/GenericPhysical.etphys'
diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/make.xml b/tests/org.eclipse.etrice.generator.cpp.tests/make.xml
deleted file mode 100644
index af3fe27d6..000000000
--- a/tests/org.eclipse.etrice.generator.cpp.tests/make.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Ant makefile for building and running of tests.
-
- Includes common.xml from org.eclipse.etrice.generator.common.tests
--->
-<project name="org.eclipse.etrice.generator.cpp.tests" basedir="." default="all">
-
- <!-- <target name="testing" depends="setVars,common.testing">
-
- // add test here, testid==testSuiteFileName
- <echo>done with ${ant.project.name}</echo>
- </target> -->
-
- <target name="testing" depends="copyModels">
- <!-- modified target from common.xml because cpp is not complete yet -->
- <test testid="SendingDataTestCpp" models="${models.path}/sendingData/SendingDataTestCpp.room ${models.path}/GenericPhysical.etphys" />
- <test testid="CompileTests" models="${models.path}/CompileTests.room ${models.path}/GenericPhysical.etphys ${models.path}/DetailExpressionTest.room ${models.path}/StatemachineInterfaceTest.room ${models.path}/StatemachineInterfaceInheritedTest.room ${models.path}/StatemachineInterfaceTest.room ${models.path}/ContinuationTransitionTest.room ${models.path}/TimingService.room" />
- <test testid="ActorCommunicationTest" models="${models.path}/ActorCommunicationTest.room ${models.path}/GenericPhysical.etphys ${models.path}/TimingService.room" />
- <test testid="ChoicePointTest" models="${models.path}/ChoicePointTest.room ${models.path}/GenericPhysical.etphys" />
- <test testid="ChoicePointTestExtended" models="${models.path}/ChoicePointTestExtended.room ${models.path}/GenericPhysical.etphys" />
- <test testid="DataDrivenTest" models="${models.path}/DataDrivenTest.room ${models.path}/GenericPhysical.etphys ${models.path}/TimingService.room" />
- <test testid="HandlerTest" models="${models.path}/HandlerTest.room ${models.path}/GenericPhysical.etphys" />
- <test testid="OperationInheritanceTest" models="${models.path}/OperationInheritanceTest.room ${models.path}/GenericPhysical.etphys" />
- <test testid="PingPongThreadTest" models="${models.path}/PingPongThreadTest.etmap ${models.path}/PingPongThreadTest.room ${models.path}/TimingService.room" />
- <test testid="PingPongThreadReplPortTest" models="${models.path}/PingPongThreadReplPortTest.etmap ${models.path}/PingPongThreadReplPortTest.room ${models.path}/TimingService.room" />
- <test testid="InitializationTest" models="${models.path}/InitializationTest.room ${models.path}/GenericPhysical.etphys" />
- </target>
-
- <target name="copyModels" depends="common.copyModels">
- <copy todir="${models.path}">
- <fileset dir="./targetModels"/>
- </copy>
- <!--<move file="${models.path}/staticConfig/StaticConfigTest_C.room" toFile="${models.path}/staticConfig//StaticConfigTest.room" />-->
- </target>
-
- <!-- ################################################################ -->
-
- <import file="../org.eclipse.etrice.generator.common.tests/common.xml" as="common"/>
-
- <property name="runtime.path" value="../../runtime/org.eclipse.etrice.runtime.c" />
- <property name="modellib.path" value="../../runtime/org.eclipse.etrice.modellib.cpp" />
- <property name="cpp-runtime.path" value="../../runtime/org.eclipse.etrice.runtime.cpp" />
-
- <target name="set_local_rt" unless="runtime.platform">
- <!--<property name="runtime.platform" value="MT_POSIX_GENERIC_GCC"/>-->
- <property name="runtime.platform" value="MT_WIN_MinGW"/>
- <echo> runtime.platform = ${runtime.platform} </echo>
- </target>
- <target name="setVars" depends="set_local_rt,common.setVars"/>
-
- <target name="all" depends="clean,copyModels,testing"></target>
-
- <!-- test := generate 1 executable, build, run, process results -->
- <macrodef name="test">
- <attribute name="testId"/>
- <attribute name="models"/>
- <sequential>
- <echo>generating @{testId}</echo>
- <standaloneGenerator testId="@{testId}" models="@{models}"/>
-
- <echo>building @{testId}</echo>
- <build testId="@{testId}"/>
-
- <echo>running @{testId}</echo>
- <run testId="@{testId}"/>
-
- <echo>converting @{testId}</echo>
- <convert testId="@{testId}"/>
-
- <echo>copying result @{testId}</echo>
- <copyResult testId="@{testId}" targetId="CPP_${runtime.platform}_"/>
- </sequential>
- </macrodef>
-
- <macrodef name="standaloneGenerator">
- <attribute name="testId"/>
- <attribute name="models"/>
- <sequential>
- <mkdir dir="${output}"/>
- <java output="${output}/@{testId}_generate.txt" error="${output}/@{testId}_generate_err.txt" classname="org.eclipse.etrice.generator.cpp.Main" fork="true" failonerror="true">
- <arg line="@{models}"/>
- <arg value="-genDir"/><arg value="src-gen/@{testId}"/>
- <arg value="-msc_instr"/>
- <classpath refid="etrice.clspath"/>
- </java>
- </sequential>
- </macrodef>
-
- <!--
- build: compiles and links the generated Cpp sources
- -->
- <macrodef name="build">
- <attribute name="testId"/>
- <sequential>
- <mkdir dir="${bin.path}"/>
- <mkdir dir="${output}"/>
- <exec executable="make" failonerror="true" output="${output}/@{testId}_build.txt">
- <arg line="all"/>
- <arg line="APP_TARGET=@{testId}.exe"/>
- <arg line="APP_BUILD_DIR=${bin.path}"/>
- <arg line="APP_SRCDIRS_REC='./src-gen/@{testId} ./src/@{testId}'"/>
- <arg line="RUNTIME_ROOTDIR=${runtime.path}"/>
- <arg line="CPP_RUNTIME_ROOTDIR=${cpp-runtime.path}"/>
- <arg line="MODELLIB_ROOTDIR=${modellib.path}"/>
- <arg line="TARGET_PLATFORM=${runtime.platform}"/>
- </exec>
- </sequential>
- </macrodef>
-
- <macrodef name="run">
- <attribute name="testId"/>
- <sequential>
- <mkdir dir="${output}"/>
- <mkdir dir="${testlog.path}"/>
- <exec dir="./" output="${output}/@{testId}_run.txt" resolveexecutable="true" executable="${bin.path}/@{testId}.exe" timeout="${run.msTimout}">
- <arg value="-run_as_test"/>
- </exec>
- </sequential>
- </macrodef>
-
-</project>
diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/org.eclipse.etrice.generator.cpp.tests make.xml.launch b/tests/org.eclipse.etrice.generator.cpp.tests/org.eclipse.etrice.generator.cpp.tests make.xml.launch
deleted file mode 100644
index 6849d0869..000000000
--- a/tests/org.eclipse.etrice.generator.cpp.tests/org.eclipse.etrice.generator.cpp.tests make.xml.launch
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.etrice.generator.cpp.tests/make.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.generator.cpp.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">
-<mapEntry key="eclipse.home" value="${eclipse_home}"/>
-<mapEntry key="eclipse.pdebuild.home" value="${target_platform_plugin_location:org.eclipse.pde.build}"/>
-<mapEntry key="eclipse.pdebuild.scripts" value="${target_platform_plugin_location:org.eclipse.pde.build}/scripts/"/>
-<mapEntry key="eclipse.pdebuild.templates" value="${target_platform_plugin_location:org.eclipse.pde.build}/templates/"/>
-<mapEntry key="eclipse.running" value="true"/>
-<mapEntry key="com.google.guava" value="${target_platform_plugin_location:com.google.guava}"/>
-<mapEntry key="com.google.inject" value="${target_platform_plugin_location:com.google.inject}"/>
-<mapEntry key="javax.inject" value="${target_platform_plugin_location:javax.inject}"/>
-<mapEntry key="org.antlr.runtime" value="${target_platform_plugin_location:org.antlr.runtime}"/>
-<mapEntry key="org.apache.log4j" value="${target_platform_plugin_location:org.apache.log4j}"/>
-<mapEntry key="org.eclipse.emf.common" value="${target_platform_plugin_location:org.eclipse.emf.common}"/>
-<mapEntry key="org.eclipse.emf.ecore" value="${target_platform_plugin_location:org.eclipse.emf.ecore}"/>
-<mapEntry key="org.eclipse.emf.ecore.xmi" value="${target_platform_plugin_location:org.eclipse.emf.ecore.xmi}"/>
-<mapEntry key="org.eclipse.equinox.common" value="${target_platform_plugin_location:org.eclipse.equinox.common}"/>
-<mapEntry key="org.eclipse.xtend.lib" value="${target_platform_plugin_location:org.eclipse.xtend.lib}"/>
-<mapEntry key="org.eclipse.xtext" value="${target_platform_plugin_location:org.eclipse.xtext}"/>
-<mapEntry key="org.eclipse.xtext.common.types" value="${target_platform_plugin_location:org.eclipse.xtext.common.types}"/>
-<mapEntry key="org.eclipse.xtext.util" value="${target_platform_plugin_location:org.eclipse.xtext.util}"/>
-<mapEntry key="org.eclipse.xtext.xbase.lib" value="${target_platform_plugin_location:org.eclipse.xtext.xbase.lib}"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.etrice.generator.cpp.tests/make.xml}"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/tests/org.eclipse.etrice.generator.java.tests/buckminster.cspec b/tests/org.eclipse.etrice.generator.java.tests/buckminster.cspec
deleted file mode 100644
index b4b3128c9..000000000
--- a/tests/org.eclipse.etrice.generator.java.tests/buckminster.cspec
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.generator.java.tests" componentType="buckminster" version="0.5.0.qualifier">
- <cs:actions>
- <cs:public name="run_tests" actor="ant">
- <cs:actorProperties>
- <cs:property key="buildFile" value="make.xml"/>
- <cs:property key="targets" value="all"/>
- </cs:actorProperties>
- </cs:public>
- </cs:actions>
-</cs:cspec>
diff --git a/tests/org.eclipse.etrice.generator.java.tests/build.gradle b/tests/org.eclipse.etrice.generator.java.tests/build.gradle
index 006dc073d..0c8b984e7 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/build.gradle
+++ b/tests/org.eclipse.etrice.generator.java.tests/build.gradle
@@ -2,7 +2,7 @@ plugins {
id 'java-base'
}
-apply from: etTest
+apply from: "$rootDir/gradle/etTest.gradle"
def genericPhysical = '../org.eclipse.etrice.generator.common.tests/models/GenericPhysical.etphys'
diff --git a/tests/org.eclipse.etrice.generator.java.tests/make.xml b/tests/org.eclipse.etrice.generator.java.tests/make.xml
deleted file mode 100644
index a75d0330c..000000000
--- a/tests/org.eclipse.etrice.generator.java.tests/make.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Ant makefile for building and running of tests.
-
- Includes common.xml from org.eclipse.etrice.generator.common.tests
--->
-<project name="org.eclipse.etrice.generator.java.tests" basedir="." default="all">
-
- <target name="testing" depends="dynamicActorTests,common.testing">
-
- <!-- add test here, testid==testSuiteFileName -->
- <test testid="SendingDataTestJava" models="${models.path}/sendingData/SendingDataTestJava.room ${models.path}/GenericPhysical.etphys" />
- <test testid="TCPTest" models="${models.path}/TCPTest.room ${models.path}/GenericPhysical.etphys ${models.path}/TcpService.room" />
- <test testid="DynamicConfigTest" models="${models.path}/DynamicConfigTest.etmap ${models.path}/DynamicConfigTest.room ${models.path}/DynamicConfigTest.config ${models.path}/TimingService.room"/>
- <test testid="StaticConfigTest" models="${models.path}/staticConfig/StaticConfigTest.etmap ${models.path}/staticConfig/StaticConfigTest.room ${models.path}/staticConfig/StaticConfigTest.config ${models.path}/TimingService.room" />
-
- <echo>done with ${ant.project.name}</echo>
- </target>
-
- <target name="dynamicActorTests">
- <property name="genOptions" value="-persistable -storeDataObj"/>
-
- <test testid="DynamicActorTest1" genOptions="${genOptions}" models="${models.path}/DynamicActorTest1.etmap ${models.path}/DynamicActorTest1.room" />
- <test testid="DynamicActorTest2" genOptions="${genOptions}" models="${models.path}/DynamicActorTest2.etmap ${models.path}/DynamicActorTest2.room" />
- <test testid="DynamicActorTest3" genOptions="${genOptions}" models="${models.path}/DynamicActorTest3.room ${models.path}/GenericPhysical.etphys" />
- <test testid="DynamicActorTest4" genOptions="${genOptions}" models="${models.path}/DynamicActorTest4.room ${models.path}/GenericPhysical.etphys" />
- <test testid="DynamicActorTest5" genOptions="${genOptions}" models="${models.path}/DynamicActorTest5.room ${models.path}/GenericPhysical.etphys" />
- <test testid="DynamicActorTest6" genOptions="${genOptions}" models="${models.path}/DynamicActorTest6.room ${models.path}/GenericPhysical.etphys" />
- <test testid="DynamicActorTest7" genOptions="${genOptions}" models="${models.path}/DynamicActorTest7.etmap ${models.path}/DynamicActorTest7.room" />
- <test testid="StoreRestore" genOptions="${genOptions}" models="${models.path}/StoreRestore.room ${models.path}/GenericPhysical.etphys" />
- </target>
-
- <target name="copyModels" depends="common.copyModels">
- <copy todir="${models.path}">
- <fileset dir="./targetModels"/>
- </copy>
- <move file="${models.path}/staticConfig/StaticConfigTest_Java.room" toFile="${models.path}/staticConfig//StaticConfigTest.room" />
- </target>
-
- <!-- ################################################################ -->
-
- <import file="../org.eclipse.etrice.generator.common.tests/common.xml" as="common"/>
-
- <property name="modellib.path" value="../../runtime/org.eclipse.etrice.modellib.java" />
- <property name="runtime.path" value="../../runtime/org.eclipse.etrice.runtime.java" />
-
- <target name="all" depends="clean,copyModels,testing"/>
-
- <!-- test := generate 1 executable, build, run, process results -->
- <macrodef name="test">
- <attribute name="testId"/>
- <attribute name="models"/>
- <attribute name="genOptions" default=""/>
- <sequential>
- <standaloneGenerator testId="@{testId}" models="@{models}" genOptions="@{genOptions}"/>
- <build testId="@{testId}"/>
- <run testId="@{testId}"/>
- <convert testId="@{testId}"/>
- <copyResult testId="@{testId}" targetId="Java_"/>
- </sequential>
- </macrodef>
-
- <macrodef name="standaloneGenerator">
- <attribute name="testId"/>
- <attribute name="models"/>
- <attribute name="genOptions" default=""/>
- <sequential>
- <mkdir dir="${output}"/>
- <java output="${output}/generate.txt" error="${output}/generate_err.txt" classname="org.eclipse.etrice.generator.java.Main" fork="true" failonerror="true">
- <arg line="@{models}"/>
- <arg value="-genDir"/><arg value="src-gen/@{testId}"/>
- <arg value="-msc_instr" />
- <arg line="@{genOptions}" />
- <classpath refid="etrice.clspath" />
- </java>
- </sequential>
- </macrodef>
-
- <!--
- compile: compiles the generated Java sources
- -->
- <macrodef name="build">
- <attribute name="testId"/>
- <sequential>
- <mkdir dir="${bin.path}/@{testId}" />
- <!-- ./src/xxx is optional, create it anyway to avoid error -->
- <mkdir dir="./src/@{testId}" />
- <record name="${basedir}/output/compile.txt" action="start"/>
- <javac destdir="${bin.path}/@{testId}" source="1.6" classpath="${runtime.path}/target/classes" debug="off" verbose="off">
- <src>
- <pathelement location="src-gen/@{testId}" />
- <pathelement location="src/@{testId}" />
- </src>
- </javac>
- <record name="${basedir}/output/compile.txt" action="stop"/>
- </sequential>
- </macrodef>
-
- <!--
- run: runs all executables
- -->
- <macrodef name="run">
- <attribute name="testId"/>
- <sequential>
- <mkdir dir="${testlog.path}" />
- <!-- get runner class -->
- <local name="runner.class"/>
- <fileset id="runnerFileSet" dir="./src-gen/@{testId}">
- <include name="**/*Runner.java"/>
- </fileset>
- <pathconvert property="runner.class">
- <string>${toString:runnerFileSet}</string>
- <chainedmapper>
- <globmapper from="*.java" to="*"/>
- <packagemapper from="*" to="*"/>
- </chainedmapper>
- </pathconvert>
- <!--<echo>path of runner.java: ${toString:runnerFileSet}</echo>
- <echo>runner path converted to class: ${runner.class}</echo>-->
-
- <echo>run @{testId}</echo>
- <java output="${output}/run@{testId}.txt" classname="${runner.class}" fork="true" failonerror="true" timeout="${run.msTimout}">
- <arg value="-run_as_test" />
- <classpath path="./bin/@{testId};${runtime.path}/target/classes;" />
- </java>
- </sequential>
- </macrodef>
-
-</project>
diff --git a/tests/org.eclipse.etrice.generator.java.tests/org.eclipse.etrice.generator.java.tests make.xml.launch b/tests/org.eclipse.etrice.generator.java.tests/org.eclipse.etrice.generator.java.tests make.xml.launch
deleted file mode 100644
index 7ad38f90f..000000000
--- a/tests/org.eclipse.etrice.generator.java.tests/org.eclipse.etrice.generator.java.tests make.xml.launch
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.etrice.generator.java.tests/make.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.generator.java.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.etrice.generator.java.tests/make.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-v"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">
-<mapEntry key="eclipse.home" value="${eclipse_home}"/>
-<mapEntry key="eclipse.pdebuild.home" value="${target_platform_plugin_location:org.eclipse.pde.build}"/>
-<mapEntry key="eclipse.pdebuild.scripts" value="${target_platform_plugin_location:org.eclipse.pde.build}/scripts/"/>
-<mapEntry key="eclipse.pdebuild.templates" value="${target_platform_plugin_location:org.eclipse.pde.build}/templates/"/>
-<mapEntry key="eclipse.running" value="true"/>
-<mapEntry key="com.google.guava" value="${target_platform_plugin_location:com.google.guava}"/>
-<mapEntry key="com.google.inject" value="${target_platform_plugin_location:com.google.inject}"/>
-<mapEntry key="javax.inject" value="${target_platform_plugin_location:javax.inject}"/>
-<mapEntry key="org.antlr.runtime" value="${target_platform_plugin_location:org.antlr.runtime}"/>
-<mapEntry key="org.apache.log4j" value="${target_platform_plugin_location:org.apache.log4j}"/>
-<mapEntry key="org.eclipse.emf.common" value="${target_platform_plugin_location:org.eclipse.emf.common}"/>
-<mapEntry key="org.eclipse.emf.ecore" value="${target_platform_plugin_location:org.eclipse.emf.ecore}"/>
-<mapEntry key="org.eclipse.emf.ecore.xmi" value="${target_platform_plugin_location:org.eclipse.emf.ecore.xmi}"/>
-<mapEntry key="org.eclipse.equinox.common" value="${target_platform_plugin_location:org.eclipse.equinox.common}"/>
-<mapEntry key="org.eclipse.xtend.lib" value="${target_platform_plugin_location:org.eclipse.xtend.lib}"/>
-<mapEntry key="org.eclipse.xtext" value="${target_platform_plugin_location:org.eclipse.xtext}"/>
-<mapEntry key="org.eclipse.xtext.common.types" value="${target_platform_plugin_location:org.eclipse.xtext.common.types}"/>
-<mapEntry key="org.eclipse.xtext.util" value="${target_platform_plugin_location:org.eclipse.xtext.util}"/>
-<mapEntry key="org.eclipse.xtext.xbase.lib" value="${target_platform_plugin_location:org.eclipse.xtext.xbase.lib}"/>
-</mapAttribute>
-</launchConfiguration>
diff --git a/tests/org.eclipse.etrice.runtime.c.tests/Makefile b/tests/org.eclipse.etrice.runtime.c.tests/Makefile
deleted file mode 100644
index 1f9507676..000000000
--- a/tests/org.eclipse.etrice.runtime.c.tests/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# for make.xml
-include ${RUNTIME_ROOTDIR}/buildTools/runtime.mk
-
-# ---
-IN_TARGET := $(notdir $(shell pwd)).exe
-IN_BUILD_DIR := ./bin
-IN_INCDIRS += ./src
-IN_SRCDIRS_REC += ./src
-#---
-
-
-# Create rules
-include ${RUNTIME_ROOTDIR}/buildTools/Makefile.mk \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.runtime.c.tests/buckminster.cspec b/tests/org.eclipse.etrice.runtime.c.tests/buckminster.cspec
deleted file mode 100644
index f803be39c..000000000
--- a/tests/org.eclipse.etrice.runtime.c.tests/buckminster.cspec
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.runtime.c.tests" componentType="buckminster" version="0.5.0.qualifier">
- <cs:actions>
- <cs:public name="run_tests" actor="ant">
- <cs:actorProperties>
- <cs:property key="buildFile" value="make.xml"/>
- <cs:property key="targets" value="all"/>
- </cs:actorProperties>
- </cs:public>
- </cs:actions>
-</cs:cspec>
diff --git a/tests/org.eclipse.etrice.runtime.c.tests/build.gradle b/tests/org.eclipse.etrice.runtime.c.tests/build.gradle
index 1321f31f4..32ebe4192 100644
--- a/tests/org.eclipse.etrice.runtime.c.tests/build.gradle
+++ b/tests/org.eclipse.etrice.runtime.c.tests/build.gradle
@@ -4,7 +4,7 @@ plugins {
id 'c'
}
-apply from: etUnitConverter
+apply from: "$rootDir/gradle/etUnitConverter.gradle"
model {
components {
diff --git a/tests/org.eclipse.etrice.runtime.c.tests/make.xml b/tests/org.eclipse.etrice.runtime.c.tests/make.xml
deleted file mode 100644
index a37d667b1..000000000
--- a/tests/org.eclipse.etrice.runtime.c.tests/make.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Ant makefile for building and running of tests.
- This includes conversion of the etunit
- results into xunit xml.
-
- @author Henrik Rentz-Reichert
--->
-<project name="org.eclipse.etrice.runtime.c.tests" basedir="." default="all">
-
- <import file="../org.eclipse.etrice.generator.common.tests/common.xml" as="common"/>
-
- <property name="runtime.path" value="../../runtime/org.eclipse.etrice.runtime.c" />
-
- <target name="set_local_rt" unless="runtime.platform">
- <!-- <property name="runtime.platform" value="MT_POSIX_GENERIC_GCC"/> -->
- <property name="runtime.platform" value="MT_WIN_MinGW"/>
- <echo> runtime.platform = ${runtime.platform} </echo>
- </target>
- <target name="setVars" depends="set_local_rt,common.setVars"/>
-
- <!--
- all: compiles, runs, converts and copies the results
- -->
- <target name="all" depends="convert,copy_results">
- <echo>done with ${ant.project.name}</echo>
- </target>
-
- <!--
- build: compiles and link everything
- -->
- <target name="build" depends="setVars,clean">
- <mkdir dir="${output}"/>
- <mkdir dir="${bin.path}"/>
- <exec executable="make" failonerror="true" output="${output}/build.txt">
- <arg line="all"/>
- <arg line="RUNTIME_ROOTDIR=${runtime.path}"/>
- <arg line="TARGET_PLATFORM=${runtime.platform}"/>
- </exec>
- </target>
-
- <!--
- run: runs all executables
- -->
- <target name="run" depends="build">
- <mkdir dir="${testlog.path}"/>
- <echo>start RuntimeTest</echo>
- <exec resolveexecutable="true" executable="${bin.path}/${ant.project.name}.exe" output="${output}/run.txt" />
- <echo>end RuntimeTest</echo>
- </target>
-
- <!--
- convert: converts etu- into xunit xml-format
- -->
- <target name="convert" depends="run">
- <convertPre testId="TestEtUnitSpecial"/>
- <convertPre testId="TestCRuntime"/>
- </target>
-
- <!--
- copy_results: copies the *.xml results to their final destination
- -->
- <target name="copy_results" depends="setVars">
- <copyResult testId="TestEtUnitSpecial" targetid="${runtime.platform}_"/>
- <copyResult testId="TestCRuntime" targetid="${runtime.platform}_"/>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.etrice.runtime.c.tests/org.eclipse.etrice.runtime.c.tests make.xml.launch b/tests/org.eclipse.etrice.runtime.c.tests/org.eclipse.etrice.runtime.c.tests make.xml.launch
deleted file mode 100644
index 37fbb50c8..000000000
--- a/tests/org.eclipse.etrice.runtime.c.tests/org.eclipse.etrice.runtime.c.tests make.xml.launch
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.etrice.runtime.c.tests/make.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.runtime.c.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">
-<mapEntry key="eclipse.home" value="${eclipse_home}"/>
-<mapEntry key="eclipse.pdebuild.home" value="${target_platform_plugin_location:org.eclipse.pde.build}"/>
-<mapEntry key="eclipse.pdebuild.scripts" value="${target_platform_plugin_location:org.eclipse.pde.build}/scripts/"/>
-<mapEntry key="eclipse.pdebuild.templates" value="${target_platform_plugin_location:org.eclipse.pde.build}/templates/"/>
-<mapEntry key="eclipse.running" value="true"/>
-<mapEntry key="com.google.guava" value="${target_platform_plugin_location:com.google.guava}"/>
-<mapEntry key="com.google.inject" value="${target_platform_plugin_location:com.google.inject}"/>
-<mapEntry key="javax.inject" value="${target_platform_plugin_location:javax.inject}"/>
-<mapEntry key="org.antlr.runtime" value="${target_platform_plugin_location:org.antlr.runtime}"/>
-<mapEntry key="org.apache.log4j" value="${target_platform_plugin_location:org.apache.log4j}"/>
-<mapEntry key="org.eclipse.emf.common" value="${target_platform_plugin_location:org.eclipse.emf.common}"/>
-<mapEntry key="org.eclipse.emf.ecore" value="${target_platform_plugin_location:org.eclipse.emf.ecore}"/>
-<mapEntry key="org.eclipse.emf.ecore.xmi" value="${target_platform_plugin_location:org.eclipse.emf.ecore.xmi}"/>
-<mapEntry key="org.eclipse.equinox.common" value="${target_platform_plugin_location:org.eclipse.equinox.common}"/>
-<mapEntry key="org.eclipse.xtend.lib" value="${target_platform_plugin_location:org.eclipse.xtend.lib}"/>
-<mapEntry key="org.eclipse.xtext" value="${target_platform_plugin_location:org.eclipse.xtext}"/>
-<mapEntry key="org.eclipse.xtext.common.types" value="${target_platform_plugin_location:org.eclipse.xtext.common.types}"/>
-<mapEntry key="org.eclipse.xtext.util" value="${target_platform_plugin_location:org.eclipse.xtext.util}"/>
-<mapEntry key="org.eclipse.xtext.xbase.lib" value="${target_platform_plugin_location:org.eclipse.xtext.xbase.lib}"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.etrice.runtime.c.tests/make.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-v"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/Makefile b/tests/org.eclipse.etrice.runtime.cpp.tests/Makefile
deleted file mode 100644
index 6d6a9607b..000000000
--- a/tests/org.eclipse.etrice.runtime.cpp.tests/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-include ${CPP_RUNTIME_ROOTDIR}/buildTools/runtime.mk
-
-# ---
-IN_TARGET := $(notdir $(shell pwd)).exe
-IN_BUILD_DIR := ./bin
-IN_INCDIRS += ./src
-IN_SRCDIRS_REC += ./src
-CC = ${CXX}
-IN_CFLAGS += -std=c++98 -O0 -g3 -pedantic -Wall
-#---
-
-
-# Create rules
-include ${RUNTIME_ROOTDIR}/buildTools/Makefile.mk
diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/buckminster.cspec b/tests/org.eclipse.etrice.runtime.cpp.tests/buckminster.cspec
deleted file mode 100644
index 74fcad21d..000000000
--- a/tests/org.eclipse.etrice.runtime.cpp.tests/buckminster.cspec
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.runtime.cpp.tests" componentType="buckminster" version="0.5.0.qualifier">
- <cs:actions>
- <cs:public name="run_tests" actor="ant">
- <cs:actorProperties>
- <cs:property key="buildFile" value="make.xml"/>
- <cs:property key="targets" value="all"/>
- </cs:actorProperties>
- </cs:public>
- </cs:actions>
-</cs:cspec>
diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle b/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle
index f4a919d3e..c3bcbb50b 100644
--- a/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle
+++ b/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle
@@ -4,7 +4,7 @@ plugins {
id 'cpp'
}
-apply from: etUnitConverter
+apply from: "$rootDir/gradle/etUnitConverter.gradle"
model {
components {
diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/make.xml b/tests/org.eclipse.etrice.runtime.cpp.tests/make.xml
deleted file mode 100644
index e8c7725d1..000000000
--- a/tests/org.eclipse.etrice.runtime.cpp.tests/make.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Ant makefile for building and running of tests.
- This includes conversion of the etunit
- results into xunit xml.
-
- @author Henrik Rentz-Reichert
--->
-<project name="org.eclipse.etrice.runtime.cpp.tests" basedir="." default="all">
-
- <import file="../org.eclipse.etrice.generator.common.tests/common.xml" as="common"/>
-
- <property name="runtime.path" value="../../runtime/org.eclipse.etrice.runtime.c" />
- <property name="cpp-runtime.path" value="../../runtime/org.eclipse.etrice.runtime.cpp" />
-
- <target name="set_local_rt" unless="runtime.platform">
- <!-- <property name="runtime.platform" value="MT_POSIX_GENERIC_GCC"/> -->
- <property name="runtime.platform" value="MT_WIN_MinGW"/>
- <echo> runtime.platform = ${runtime.platform} </echo>
- </target>
- <target name="setVars" depends="set_local_rt,common.setVars"/>
-
- <!--
- all: compiles, runs, converts and copies the results
- -->
- <target name="all" depends="convert,copy_results">
- <echo>done with ${ant.project.name}</echo>
- </target>
-
- <!--
- build: compiles and link everything
- -->
- <target name="build" depends="setVars,clean">
- <mkdir dir="${output}"/>
- <mkdir dir="${bin.path}"/>
- <exec executable="make" failonerror="true" output="${output}/build.txt">
- <arg line="all"/>
- <arg line="RUNTIME_ROOTDIR=${runtime.path}"/>
- <arg line="TARGET_PLATFORM=${runtime.platform}"/>
- <arg line="CPP_RUNTIME_ROOTDIR=${cpp-runtime.path}"/>
- </exec>
- </target>
-
- <!--
- run: runs all executables
- -->
- <target name="run" depends="build">
- <mkdir dir="${testlog.path}"/>
- <echo>start RuntimeTest</echo>
- <exec resolveexecutable="true" executable="${bin.path}/${ant.project.name}.exe" output="${output}/run.txt" />
- <echo>end RuntimeTest</echo>
- </target>
-
- <!--
- convert: converts etu- into xunit xml-format
- -->
- <target name="convert" depends="run">
- <convertPre testId="TestCppRuntime"/>
- </target>
-
- <!--
- copy_results: copies the *.xml results to their final destination
- -->
- <target name="copy_results" depends="setVars">
- <copyResult testId="TestCppRuntime" targetid="${runtime.platform}_"/>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/org.eclipse.etrice.runtime.cpp.tests make.xml.launch b/tests/org.eclipse.etrice.runtime.cpp.tests/org.eclipse.etrice.runtime.cpp.tests make.xml.launch
deleted file mode 100644
index 8d344f97e..000000000
--- a/tests/org.eclipse.etrice.runtime.cpp.tests/org.eclipse.etrice.runtime.cpp.tests make.xml.launch
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.etrice.runtime.cpp.tests/make.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.runtime.cpp.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">
-<mapEntry key="eclipse.home" value="${eclipse_home}"/>
-<mapEntry key="eclipse.pdebuild.home" value="${target_platform_plugin_location:org.eclipse.pde.build}"/>
-<mapEntry key="eclipse.pdebuild.scripts" value="${target_platform_plugin_location:org.eclipse.pde.build}/scripts/"/>
-<mapEntry key="eclipse.pdebuild.templates" value="${target_platform_plugin_location:org.eclipse.pde.build}/templates/"/>
-<mapEntry key="eclipse.running" value="true"/>
-<mapEntry key="com.google.guava" value="${target_platform_plugin_location:com.google.guava}"/>
-<mapEntry key="com.google.inject" value="${target_platform_plugin_location:com.google.inject}"/>
-<mapEntry key="javax.inject" value="${target_platform_plugin_location:javax.inject}"/>
-<mapEntry key="org.antlr.runtime" value="${target_platform_plugin_location:org.antlr.runtime}"/>
-<mapEntry key="org.apache.log4j" value="${target_platform_plugin_location:org.apache.log4j}"/>
-<mapEntry key="org.eclipse.emf.common" value="${target_platform_plugin_location:org.eclipse.emf.common}"/>
-<mapEntry key="org.eclipse.emf.ecore" value="${target_platform_plugin_location:org.eclipse.emf.ecore}"/>
-<mapEntry key="org.eclipse.emf.ecore.xmi" value="${target_platform_plugin_location:org.eclipse.emf.ecore.xmi}"/>
-<mapEntry key="org.eclipse.equinox.common" value="${target_platform_plugin_location:org.eclipse.equinox.common}"/>
-<mapEntry key="org.eclipse.xtend.lib" value="${target_platform_plugin_location:org.eclipse.xtend.lib}"/>
-<mapEntry key="org.eclipse.xtext" value="${target_platform_plugin_location:org.eclipse.xtext}"/>
-<mapEntry key="org.eclipse.xtext.common.types" value="${target_platform_plugin_location:org.eclipse.xtext.common.types}"/>
-<mapEntry key="org.eclipse.xtext.util" value="${target_platform_plugin_location:org.eclipse.xtext.util}"/>
-<mapEntry key="org.eclipse.xtext.xbase.lib" value="${target_platform_plugin_location:org.eclipse.xtext.xbase.lib}"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.etrice.runtime.cpp.tests/make.xml}"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/tests/org.eclipse.etrice.runtime.java.tests/buckminster.cspec b/tests/org.eclipse.etrice.runtime.java.tests/buckminster.cspec
deleted file mode 100644
index c02254993..000000000
--- a/tests/org.eclipse.etrice.runtime.java.tests/buckminster.cspec
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.runtime.java.tests" componentType="buckminster" version="0.5.0.qualifier">
- <cs:dependencies>
- <cs:dependency name="org.eclipse.etrice.runtime.java" componentType="buckminster"/>
- </cs:dependencies>
-</cs:cspec>
diff --git a/tests/pom.xml b/tests/pom.xml
index 9ee1ea0a3..4376835cb 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -6,12 +6,11 @@
<parent>
<groupId>org.eclipse.etrice</groupId>
<artifactId>org.eclipse.etrice.parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<relativePath>../releng/org.eclipse.etrice.parent</relativePath>
</parent>
<groupId>org.eclipse.etrice</groupId>
<artifactId>org.eclipse.etrice.tests</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<build>

Back to the top