Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-09-17 08:58:52 +0000
committerHenrik Rentz-Reichert2012-09-17 08:58:52 +0000
commit79658cb9ff203f65cbbb0d25cebb95161b6d8fa8 (patch)
tree37d698227ed1bb4d4543c7118e1f77d2251807ad /tests
parentf8b49c8613829a22ea78683ae087c57d2aaae2bc (diff)
downloadorg.eclipse.etrice-79658cb9ff203f65cbbb0d25cebb95161b6d8fa8.tar.gz
org.eclipse.etrice-79658cb9ff203f65cbbb0d25cebb95161b6d8fa8.tar.xz
org.eclipse.etrice-79658cb9ff203f65cbbb0d25cebb95161b6d8fa8.zip
[releng, integration.tests, generator.java.tests] properties for build
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/make.xml4
-rw-r--r--tests/org.eclipse.etrice.integration.tests/generate.xml18
2 files changed, 11 insertions, 11 deletions
diff --git a/tests/org.eclipse.etrice.generator.java.tests/make.xml b/tests/org.eclipse.etrice.generator.java.tests/make.xml
index 3c9e91cbd..658838c8e 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/make.xml
+++ b/tests/org.eclipse.etrice.generator.java.tests/make.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<project name="project">
- <property name="model.path" value="./models"/>
+ <property name="java.tests.model.path" value="./models"/>
<property name="modellib.path" value="../../runtime/org.eclipse.etrice.modellib.java"/>
<property name="runtime.path" value="../../runtime/org.eclipse.etrice.runtime.java"/>
<property name="bin.path" value="./bin"/>
@@ -70,7 +70,7 @@
</path>
<java output="${output}/generate.txt" classname="org.eclipse.etrice.generator.java.Main" fork="true" failonerror="true">
- <arg value="${model.path}/HandlerTest.room"/>
+ <arg value="${java.tests.model.path}/HandlerTest.room"/>
<arg value="${modellib.path}/models/TimingService.room"/>
<arg value="${modellib.path}/models/JavaTypes.room"/>
<classpath refid="clspath"/>
diff --git a/tests/org.eclipse.etrice.integration.tests/generate.xml b/tests/org.eclipse.etrice.integration.tests/generate.xml
index fcb2185d4..3368deabf 100644
--- a/tests/org.eclipse.etrice.integration.tests/generate.xml
+++ b/tests/org.eclipse.etrice.integration.tests/generate.xml
@@ -4,7 +4,7 @@
<target name="set_tp" unless="target.platform">
<echo>using local target platform</echo>
<property name="target.platform" value="C:\Users\hrentz\Downloads\eclipse\Juno\eclipse-modeling-juno-win32\eclipse"/>
- <property name="model.path" value="./model"/>
+ <property name="integration.model.path" value="./model"/>
</target>
<target name="generate" depends="set_tp">
@@ -33,14 +33,14 @@
</path>
<java output="generator_output.txt" classname="org.eclipse.etrice.generator.java.Main">
- <arg value="${model.path}/org.eclipse.etrice.integration.ChoicePointTest.room"/>
- <arg value="${model.path}/org.eclipse.etrice.integration.HandlerTest.room"/>
- <arg value="${model.path}/org.eclipse.etrice.integration.PingPongThreadTest.room"/>
- <arg value="${model.path}/org.eclipse.etrice.integration.PingPongThreadTestReplPort.room"/>
- <arg value="${model.path}/org.eclipse.etrice.integration.SendingDataByValueTest.room"/>
- <arg value="${model.path}/org.eclipse.etrice.integration.ConfigTest.room"/>
- <arg value="${model.path}/org.eclipse.etrice.integration.ConfigTest.config"/>
- <arg value="${model.path}/org.eclipse.etrice.integration.tests.room"/>
+ <arg value="${integration.model.path}/org.eclipse.etrice.integration.ChoicePointTest.room"/>
+ <arg value="${integration.model.path}/org.eclipse.etrice.integration.HandlerTest.room"/>
+ <arg value="${integration.model.path}/org.eclipse.etrice.integration.PingPongThreadTest.room"/>
+ <arg value="${integration.model.path}/org.eclipse.etrice.integration.PingPongThreadTestReplPort.room"/>
+ <arg value="${integration.model.path}/org.eclipse.etrice.integration.SendingDataByValueTest.room"/>
+ <arg value="${integration.model.path}/org.eclipse.etrice.integration.ConfigTest.room"/>
+ <arg value="${integration.model.path}/org.eclipse.etrice.integration.ConfigTest.config"/>
+ <arg value="${integration.model.path}/org.eclipse.etrice.integration.tests.room"/>
<arg value="-noexit"/>
<classpath refid="clspath"/>
</java>

Back to the top