Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-09-21 14:04:59 +0000
committerHenrik Rentz-Reichert2012-09-21 14:04:59 +0000
commit411c88e8e71ba34af3578edbc75a7fa178ebdeaf (patch)
treec6c69d08731650801461663531a702d03698f3d8
parent45f470e902f28b36e9ac44f8682aab4f60e8bfe2 (diff)
downloadorg.eclipse.etrice-411c88e8e71ba34af3578edbc75a7fa178ebdeaf.tar.gz
org.eclipse.etrice-411c88e8e71ba34af3578edbc75a7fa178ebdeaf.tar.xz
org.eclipse.etrice-411c88e8e71ba34af3578edbc75a7fa178ebdeaf.zip
[generator.java/c.tests] renaming result files to avoid conflict
-rw-r--r--tests/org.eclipse.etrice.etunit.converter.tests/org.eclipse.etrice.etunit.converter.tests.launch (renamed from tests/org.eclipse.etrice.etunit.converter.tests/launch_org.eclipse.etrice.etunit.converter.tests.launch)0
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/make.xml2
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/make.xml2
3 files changed, 4 insertions, 0 deletions
diff --git a/tests/org.eclipse.etrice.etunit.converter.tests/launch_org.eclipse.etrice.etunit.converter.tests.launch b/tests/org.eclipse.etrice.etunit.converter.tests/org.eclipse.etrice.etunit.converter.tests.launch
index 1a89090a2..1a89090a2 100644
--- a/tests/org.eclipse.etrice.etunit.converter.tests/launch_org.eclipse.etrice.etunit.converter.tests.launch
+++ b/tests/org.eclipse.etrice.etunit.converter.tests/org.eclipse.etrice.etunit.converter.tests.launch
diff --git a/tests/org.eclipse.etrice.generator.c.tests/make.xml b/tests/org.eclipse.etrice.generator.c.tests/make.xml
index 76a892c93..0eaf80760 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/make.xml
+++ b/tests/org.eclipse.etrice.generator.c.tests/make.xml
@@ -269,6 +269,8 @@
copy_results: copies the *.xml results to their final destination
-->
<target name="copy_results" depends="set_tr">
+ <move file="./tmp/HandlerTest.xml" tofile="./tmp/CHandlerTest.xml"/>
+ <move file="./tmp/ChoicePointTest.xml" tofile="./tmp/CChoicePointTest.xml"/>
<copy todir="${test.results}" >
<fileset dir="./tmp">
<include name="*.xml"/>
diff --git a/tests/org.eclipse.etrice.generator.java.tests/make.xml b/tests/org.eclipse.etrice.generator.java.tests/make.xml
index d2d67ba6f..52ddae4a0 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/make.xml
+++ b/tests/org.eclipse.etrice.generator.java.tests/make.xml
@@ -164,6 +164,8 @@
copy_results: copies the *.xml results to their final destination
-->
<target name="copy_results" depends="set_tr">
+ <move file="./tmp/HandlerTest.xml" tofile="./tmp/JavaHandlerTest.xml"/>
+ <move file="./tmp/ChoicePointTest.xml" tofile="./tmp/JavaChoicePointTest.xml"/>
<copy todir="${test.results}" >
<fileset dir="./tmp">
<include name="*.xml"/>

Back to the top