[Personalrobots-commit] SF.net SVN: personalrobots:[13406] pkg/trunk

[<ge...@us...>]

Revision: 13406
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=13406&view=rev
Author:   gerkey
Date:     2009-04-04 00:38:12 +0000 (Sat, 04 Apr 2009)

Log Message:
-----------
Conditioned out failing tests when not on 32-bit Linux, ticket pending

Modified Paths:
--------------
    pkg/trunk/demos/test_2dnav_gazebo/CMakeLists.txt
    pkg/trunk/drivers/simulator/test_gazebo_plugin/CMakeLists.txt
    pkg/trunk/drivers/simulator/test_pr2_collision_gazebo/CMakeLists.txt

Modified: pkg/trunk/demos/test_2dnav_gazebo/CMakeLists.txt
===================================================================
--- pkg/trunk/demos/test_2dnav_gazebo/CMakeLists.txt	2009-04-04 00:16:41 UTC (rev 13405)
+++ pkg/trunk/demos/test_2dnav_gazebo/CMakeLists.txt	2009-04-04 00:38:12 UTC (rev 13406)
@@ -2,9 +2,27 @@
 include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
 rospack(test_2dnav_gazebo)
 
+# For now, the tests fail on 64-bit for some reason.
+# TODO: more thoroughly test and wrap up this 32-bit check
+include(CMakeDetermineSystem)
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "i686" OR
+   CMAKE_SYSTEM_PROCESSOR MATCHES "i386" OR
+   CMAKE_SYSTEM_PROCESSOR MATCHES "unknown")
+  set(_is32bit TRUE)
+else(CMAKE_SYSTEM_PROCESSOR MATCHES "i686" OR
+     CMAKE_SYSTEM_PROCESSOR MATCHES "i386" OR
+     CMAKE_SYSTEM_PROCESSOR MATCHES "unknown")
+  set(_is32bit FALSE)
+endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686" OR
+      CMAKE_SYSTEM_PROCESSOR MATCHES "i386" OR
+      CMAKE_SYSTEM_PROCESSOR MATCHES "unknown")
+
+if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND _is32bit)
+
 rospack_add_rostest(test_2dnav_wg.xml)
 rospack_add_rostest(test_2dnav_empty_rotation.xml)
 rospack_add_rostest(test_2dnav_empty_odom.xml)
 rospack_add_rostest(test_2dnav_empty_diagonal.xml)
 rospack_add_rostest(test_2dnav_empty_axis.xml)
 
+endif(CMAKE_SYSTEM_NAME MATCHES "Linux" AND _is32bit)

Modified: pkg/trunk/drivers/simulator/test_gazebo_plugin/CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/simulator/test_gazebo_plugin/CMakeLists.txt	2009-04-04 00:16:41 UTC (rev 13405)
+++ pkg/trunk/drivers/simulator/test_gazebo_plugin/CMakeLists.txt	2009-04-04 00:38:12 UTC (rev 13406)
@@ -2,5 +2,24 @@
 include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
 rospack(test_gazebo_plugin)
 
+# For now, the tests fail on 64-bit for some reason.
+# TODO: more thoroughly test and wrap up this 32-bit check
+include(CMakeDetermineSystem)
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "i686" OR
+   CMAKE_SYSTEM_PROCESSOR MATCHES "i386" OR
+   CMAKE_SYSTEM_PROCESSOR MATCHES "unknown")
+  set(_is32bit TRUE)
+else(CMAKE_SYSTEM_PROCESSOR MATCHES "i686" OR
+     CMAKE_SYSTEM_PROCESSOR MATCHES "i386" OR
+     CMAKE_SYSTEM_PROCESSOR MATCHES "unknown")
+  set(_is32bit FALSE)
+endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686" OR
+      CMAKE_SYSTEM_PROCESSOR MATCHES "i386" OR
+      CMAKE_SYSTEM_PROCESSOR MATCHES "unknown")
+
+if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND _is32bit)
+
 rospack_add_rostest(test_pendulum.xml)
 
+endif(CMAKE_SYSTEM_NAME MATCHES "Linux" AND _is32bit)
+

Modified: pkg/trunk/drivers/simulator/test_pr2_collision_gazebo/CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/simulator/test_pr2_collision_gazebo/CMakeLists.txt	2009-04-04 00:16:41 UTC (rev 13405)
+++ pkg/trunk/drivers/simulator/test_pr2_collision_gazebo/CMakeLists.txt	2009-04-04 00:38:12 UTC (rev 13406)
@@ -2,5 +2,22 @@
 include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
 rospack(test_pr2_collision_gazebo)
 
+# For now, the tests fail on 64-bit for some reason.
+# TODO: more thoroughly test and wrap up this 32-bit check
+include(CMakeDetermineSystem)
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "i686" OR
+   CMAKE_SYSTEM_PROCESSOR MATCHES "i386" OR
+   CMAKE_SYSTEM_PROCESSOR MATCHES "unknown")
+  set(_is32bit TRUE)
+else(CMAKE_SYSTEM_PROCESSOR MATCHES "i686" OR
+     CMAKE_SYSTEM_PROCESSOR MATCHES "i386" OR
+     CMAKE_SYSTEM_PROCESSOR MATCHES "unknown")
+  set(_is32bit FALSE)
+endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686" OR
+      CMAKE_SYSTEM_PROCESSOR MATCHES "i386" OR
+      CMAKE_SYSTEM_PROCESSOR MATCHES "unknown")
+
+if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND _is32bit)
 rospack_add_rostest_graphical(test_slide.xml)
+endif(CMAKE_SYSTEM_NAME MATCHES "Linux" AND _is32bit)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.