diff options
Diffstat (limited to 'tests/org.eclipse.etrice.runtime.c.tests/make.xml')
| -rw-r--r-- | tests/org.eclipse.etrice.runtime.c.tests/make.xml | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/tests/org.eclipse.etrice.runtime.c.tests/make.xml b/tests/org.eclipse.etrice.runtime.c.tests/make.xml index c31c499a0..7fe1b251c 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/make.xml +++ b/tests/org.eclipse.etrice.runtime.c.tests/make.xml @@ -15,7 +15,7 @@ <property name="runtime.path" value="../../runtime/org.eclipse.etrice.runtime.c"/> <property name="bin.path" value="./bin"/> - <property name="xml.output" value="./tmp"/> + <property name="xml.output" value="log"/> <property name="output" value="./output"/> <property environment="env"/> @@ -31,43 +31,43 @@ set_tp: get the target.platform property from the environment var ETRICE_TARGET_PLATFORM if not set already --> <target name="set_tp" unless="target.platform"> - <echo>using local target platform</echo> <property name="target.platform" value="${env.ETRICE_TARGET_PLATFORM}"/> + <echo>using local target platform (${target.platform})</echo> </target> <!-- set_tr: sets the test.result property if not set already --> <target name="set_tr" unless="test.results"> - <echo>using local test result folder</echo> <property name="test.results" value="./results"/> + <echo>using local test result folder (${test.results})</echo> </target> <!-- set_platform: sets the runtime.platform property if not set already --> <target name="set_platform" unless="runtime.platform"> - <echo>using MinGW runtime platform</echo> <!-- <property name="runtime.platform" value="MT_WIN_MinGW"/> --> <property name="runtime.platform" value="MT_POSIX_GENERIC_GCC"/> + <echo>using runtime platform ${runtime.platform}</echo> </target> <!-- set_rp: sets the runtime.path from the ETRICE_C_RUNTIME environment variable property if not set already --> <target name="set_rp" unless="c-runtime.path"> - <echo>using local runtime folder</echo> <property name="c-runtime.path" value="${env.ETRICE_C_RUNTIME}"/> + <echo>using local runtime folder (${c-runtime.path})</echo> </target> <!-- set_gcc_path: sets the gcc.path property from the ETRICE_GCC_PATH environment variable property if not set already --> <target name="set_gcc_path" unless="gcc.path"> - <echo>using gcc from path</echo> <property name="gcc.path" value="${env.ETRICE_GCC_PATH}"/> + <echo>using gcc from path (${gcc.path})</echo> </target> <!-- @@ -78,7 +78,7 @@ <delete dir="${c-runtime.path}/bin"/> <delete dir="${output}"/> <delete dir="src-gen"/> - <delete dir="tmp"/> + <delete dir="log"/> </target> <!-- @@ -173,6 +173,7 @@ <arg value="../../src/runtime/TestEtMessageService.c"/> <arg value="../../src/runtime/TestEtQueue.c"/> <arg value="../../src/runtime/TestEtTimer.c"/> + <arg value="../../src/runtime/TestEtDatatypes.c"/> <arg value="../../src/runtime/TestEtUnit.c"/> <arg value="../../src/runtime/helpers/TestEtTimeHelpers.c"/> <arg value="../../src/runtime/util/TestUtil.c"/> @@ -188,6 +189,7 @@ <arg value="TestEtMessageService.o"/> <arg value="TestEtQueue.o"/> <arg value="TestEtTimer.o"/> + <arg value="TestEtDatatypes.o"/> <arg value="TestEtUnit.o"/> <arg value="TestEtTimeHelpers.o"/> <arg value="TestUtil.o"/> @@ -203,7 +205,8 @@ run: runs all executables --> <target name="run" depends="build"> - <mkdir dir="tmp/testlog"/> + <mkdir dir="log"/> + <mkdir dir="log/testlog"/> <echo>start RuntimeTest</echo> <exec dir="./" resolveexecutable="true" executable="./bin/test/RuntimeTest.exe" output="${output}/run.txt" /> <echo>end RuntimeTest</echo> @@ -226,14 +229,14 @@ <java output="${output}/convert.txt" append="true" classname="org.eclipse.etrice.etunit.converter.EtUnitReportConverter" fork="true" failonerror="true"> <arg value="-suite"/> <arg value="org.eclipse.etrice.runtime.c.tests.TestEtUnitSpecial"/> - <arg value="./tmp/testlog/TestEtUnitSpecial.etu"/> + <arg value="./log/testlog/TestEtUnitSpecial.etu"/> <classpath refid="clspath"/> </java> <java output="${output}/convert.txt" append="true" classname="org.eclipse.etrice.etunit.converter.EtUnitReportConverter" fork="true" failonerror="true"> <arg value="-suite"/> <arg value="org.eclipse.etrice.runtime.c.tests.TestCRuntime"/> - <arg value="./tmp/testlog/TestCRuntime.etu"/> + <arg value="./log/testlog/TestCRuntime.etu"/> <classpath refid="clspath"/> </java> </target> @@ -242,9 +245,9 @@ copy_results: copies the *.xml results to their final destination --> <target name="copy_results" depends="set_tr"> - <move file="./tmp/testlog/TestEtUnitSpecial.xml" tofile="./tmp/testlog/CTestEtUnitSpecial.xml"/> + <move file="./log/testlog/TestEtUnitSpecial.xml" tofile="./log/testlog/CTestEtUnitSpecial.xml"/> <copy todir="${test.results}" > - <fileset dir="./tmp/testlog"> + <fileset dir="./log/testlog"> <include name="*.xml"/> </fileset> </copy> |