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

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

Revision: 23356
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23356&view=rev
Author:   gerkey
Date:     2009-08-30 22:14:43 +0000 (Sun, 30 Aug 2009)

Log Message:
-----------
Commented out spuriously failing tests, #2678

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

Modified: pkg/trunk/demos/test_2dnav_gazebo/CMakeLists.txt
===================================================================
--- pkg/trunk/demos/test_2dnav_gazebo/CMakeLists.txt	2009-08-30 22:09:28 UTC (rev 23355)
+++ pkg/trunk/demos/test_2dnav_gazebo/CMakeLists.txt	2009-08-30 22:14:43 UTC (rev 23356)
@@ -1,29 +1,32 @@
 cmake_minimum_required(VERSION 2.4.6)
 include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
-rospack(test_2dnav_gazebo)
+rosbuild_init(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.launch)
-rospack_add_rostest(test_2dnav_empty_rotation.launch)
-rospack_add_rostest(test_2dnav_empty_odom.launch)
-rospack_add_rostest(test_2dnav_empty_diagonal.launch)
-rospack_add_rostest(test_2dnav_empty_axis.launch)
-rospack_add_rostest(test_2dnav_empty_amcl_axis.launch)
-
-endif(CMAKE_SYSTEM_NAME MATCHES "Linux" AND _is32bit)
+# Tests are disabled because of spurious failures, pending move to new
+# machine dedicated to running Gazebo tests.
+#
+## 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.launch)
+#rospack_add_rostest(test_2dnav_empty_rotation.launch)
+#rospack_add_rostest(test_2dnav_empty_odom.launch)
+#rospack_add_rostest(test_2dnav_empty_diagonal.launch)
+#rospack_add_rostest(test_2dnav_empty_axis.launch)
+#rospack_add_rostest(test_2dnav_empty_amcl_axis.launch)
+#
+#endif(CMAKE_SYSTEM_NAME MATCHES "Linux" AND _is32bit)

Modified: pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/CMakeLists.txt	2009-08-30 22:09:28 UTC (rev 23355)
+++ pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/CMakeLists.txt	2009-08-30 22:14:43 UTC (rev 23356)
@@ -2,28 +2,31 @@
 include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
 rospack(test_pr2_mechanism_controllers_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_base.launch)
-rospack_add_rostest(test_arm.launch)
-
-rospack_add_rostest(hztest_pr2_mechanism.launch)
-rospack_add_rostest(hztest_rostime.launch)
-rospack_add_rostest(hztest_pr2_odom.launch)
-
-endif(CMAKE_SYSTEM_NAME MATCHES "Linux" AND _is32bit)
+# Tests are disabled because of spurious failures, pending move to new
+# machine dedicated to running Gazebo tests.
+#
+## 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_base.launch)
+#rospack_add_rostest(test_arm.launch)
+#
+#rospack_add_rostest(hztest_pr2_mechanism.launch)
+#rospack_add_rostest(hztest_rostime.launch)
+#rospack_add_rostest(hztest_pr2_odom.launch)
+#
+#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.