You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by fi...@apache.org on 2011/09/23 11:45:56 UTC
svn commit: r1174621 - in /incubator/etch/trunk/binding-cpp/runtime:
build.xml src/main/CMakeLists.txt src/test/CMakeLists.txt
Author: fitzner
Date: Fri Sep 23 09:45:56 2011
New Revision: 1174621
URL: http://svn.apache.org/viewvc?rev=1174621&view=rev
Log:
ETCH-112 Etch cpp-binding Runtime
Avoid concurrent CAPU and etch runtime build
Fixed path to CAPU test executable
Change-Id: I2f98892313c2c9d4f79f00ea7a6025ef95e17914
Modified:
incubator/etch/trunk/binding-cpp/runtime/build.xml
incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt
incubator/etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt
Modified: incubator/etch/trunk/binding-cpp/runtime/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/build.xml?rev=1174621&r1=1174620&r2=1174621&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/build.xml (original)
+++ incubator/etch/trunk/binding-cpp/runtime/build.xml Fri Sep 23 09:45:56 2011
@@ -86,8 +86,20 @@
<!-- TEST TARGET -->
<target name="do-test" unless="build.skip.tests">
- <!-- Run Unit Tests -->
- <!-- Run Unit Tests on Windows-->
+ <!-- Run CAPU Unit Tests -->
+ <!-- Run CAPU Unit Tests on Windows-->
+ <property name="executable-full-path"
+ location="lib/capu/deliverable/bin/Win32/Debug/capuTest.exe"/>
+ <exec executable="${executable-full-path}" osfamily="windows">
+ <arg value="--gtest_output=xml:${testResultsDirectory}/"/>
+ </exec>
+ <!-- Run CAPU Unit Tests on Unix -->
+ <exec executable="lib/capu/deliverable/bin/Linux/capuTest" osfamily="unix">
+ <arg value="--gtest_output=xml:${testResultsDirectory}/"/>
+ </exec>
+
+ <!-- Run Etch Unit Tests -->
+ <!-- Run Etch Unit Tests on Windows-->
<exec executable="${target}/src/test/debug/etch-cpp-test" osfamily="windows">
<arg value="--gtest_output=xml:${testResultsDirectory}/"/>
</exec>
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt?rev=1174621&r1=1174620&r2=1174621&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt Fri Sep 23 09:45:56 2011
@@ -37,3 +37,4 @@ ENDIF (UNIX)
set_target_properties (etch-cpp PROPERTIES OUTPUT_NAME "etch")
+add_dependencies (etch-cpp Capu)
\ No newline at end of file
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt?rev=1174621&r1=1174620&r2=1174621&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt Fri Sep 23 09:45:56 2011
@@ -63,3 +63,5 @@ ENDIF (WIN32 AND BUILD_CHECK_MEMORY)
IF (UNIX)
set_target_properties (etch-cpp-test PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32 -pthread")
ENDIF (UNIX)
+
+add_dependencies (etch-cpp Capu)