Fix: release with debug bag recorder MOVEMENT-999 (#20)

* Improves lunar-devel jenkins test stability (backport to kinetic-devel) (ros#1578) * extend timeout for sensitive python test * compression ratio test threshold relaxed * removed accidental test race condition * relaxes bag compression-ratio test threshold more * fix compiler warnings about unused variables (ros#1428) (ros#1576) * feat: building in debug mode * feat: building in debug mode * feat: building in debug mode * fix: * fix: fixing tests * fix: fixing tests * fix: fixing tests * feat: building in debug mode * feat: building in debug mode * feat: building in debug mode * fix: * fix: fixing tests * fix: fixing tests * fix: fixing tests * fix: adding test_rosmaster dependency to rosmsg * fix: release is failing. trying with release versions * fix: excluding local_setup.sh from the build * fix: printing version of boost * fix: changing to debug build * fix: adding more debugging info around the starting / stopping of bags * feat: changing build type to RelWithDebInfo
6RiverSystems · Nov 26, 2019 · b55c80a · b55c80a
1 parent b227ac7
commit b55c80a
Show file tree

Hide file tree

Showing 17 changed files with 41 additions and 38 deletions.
diff --git a/build.sh b/build.sh
@@ -8,7 +8,8 @@ source /opt/ros/kinetic/setup.bash
 catkin_init_workspace
 cd ..
 pwd 
-catkin_make -DCMAKE_BUILD_TYPE=Release -j8 install
+
+catkin_make -DCMAKE_BUILD_TYPE=RelWithDebInfo -j8 install
 
 apt-get update 
 apt-get install -y git curl ruby ruby-dev rubygems libffi-dev build-essential

diff --git a/clients/roscpp/src/libros/init.cpp b/clients/roscpp/src/libros/init.cpp
@@ -604,8 +604,6 @@ void shutdown()
     XMLRPCManager::instance()->shutdown();
   }
 
-  WallTime end = WallTime::now();
-
   g_started = false;
   g_ok = false;
   Time::shutdown();

diff --git a/test/test_rosbag/bag_migration_tests/test/random_play.py b/test/test_rosbag/bag_migration_tests/test/random_play.py
@@ -152,7 +152,7 @@ def test_random_play(self):
             # these bounds are much larger than they ought to be, but
             # you never know with a heavily loaded system.
             self.assertTrue(input_time - expect_time > -.5)
-            self.assertTrue(abs(input_time - expect_time) < .5)
+            self.assertTrue(abs(input_time - expect_time) < 5.0)
             break
 
         if not msg_match:

diff --git a/test/test_rosbag/test/test_bag.cpp.in b/test/test_rosbag/test/test_bag.cpp.in
@@ -376,6 +376,7 @@ TEST(rosbag, bad_topic_query_works) {
 
     rosbag::View view(bag, rosbag::TopicQuery(t));
     foreach(rosbag::MessageInstance const m, view) {
+      (void)m;
       FAIL();
     }
 

diff --git a/test/test_rosbag/test/test_bag.py b/test/test_rosbag/test/test_bag.py
@@ -324,8 +324,8 @@ def test_get_compression_info(self):
 
             # the value varies each run, I suspect based on rand, but seems
             # to generally be around 960 to 980 on my comp
-            self.assertLess(info.compressed, 1000)
-            self.assertGreater(info.compressed, 900)
+            self.assertLess(info.compressed, 1050)
+            self.assertGreater(info.compressed, 850)
 
     def test_get_time(self):
         fn = '/tmp/test_get_time.bag'

diff --git a/test/test_rosbag_storage/src/swap_bags.cpp b/test/test_rosbag_storage/src/swap_bags.cpp
@@ -72,13 +72,13 @@ void readBags(rosbag::CompressionType a, rosbag::CompressionType b) {
     BOOST_FOREACH(rosbag::MessageInstance const m, a_view)
     {
         std_msgs::Int32::ConstPtr i = m.instantiate<std_msgs::Int32>();
-        ASSERT_TRUE(i);
+        ASSERT_TRUE(i != nullptr);
         EXPECT_EQ(i->data, a);
     }
     BOOST_FOREACH(rosbag::MessageInstance const m, b_view)
     {
         std_msgs::Int32::ConstPtr i = m.instantiate<std_msgs::Int32>();
-        ASSERT_TRUE(i);
+        ASSERT_TRUE(i != nullptr);
         EXPECT_EQ(i->data, b);
     }
 }

diff --git a/test/test_roscpp/test/src/intraprocess_subscriptions.cpp b/test/test_roscpp/test/src/intraprocess_subscriptions.cpp
@@ -205,7 +205,7 @@ TEST(IntraprocessSubscriptions, noCopy)
     ros::Duration(0.01).sleep();
   }
 
-  ASSERT_TRUE(g_msg);
+  ASSERT_TRUE(g_msg != nullptr);
   EXPECT_EQ(g_msg.get(), msg.get());
   EXPECT_FALSE(g_msg->serialized);
   EXPECT_FALSE(g_msg->deserialized);
@@ -236,7 +236,7 @@ TEST(IntraprocessSubscriptions, differentRTTI)
     ros::Duration(0.01).sleep();
   }
 
-  ASSERT_TRUE(g_msg);
+  ASSERT_TRUE(g_msg != nullptr);
   EXPECT_NE((void*)g_msg.get(), (void*)msg.get());
   EXPECT_TRUE(msg->serialized);
   EXPECT_TRUE(g_msg->deserialized);
@@ -274,12 +274,12 @@ TEST(IntraprocessSubscriptions, noCopyAndDifferentRTTI)
     ros::Duration(0.01).sleep();
   }
 
-  ASSERT_TRUE(g_msg);
+  ASSERT_TRUE(g_msg != nullptr);
   EXPECT_NE((void*)g_msg.get(), (void*)msg.get());
   EXPECT_TRUE(msg->serialized);
   EXPECT_TRUE(g_msg->deserialized);
 
-  ASSERT_TRUE(g_msg2);
+  ASSERT_TRUE(g_msg2 != nullptr);
   EXPECT_EQ(g_msg2.get(), msg.get());
   EXPECT_TRUE(g_msg2->serialized);
   EXPECT_FALSE(g_msg2->deserialized);

diff --git a/test/test_roscpp/test/src/nonconst_subscriptions.cpp b/test/test_roscpp/test/src/nonconst_subscriptions.cpp
@@ -75,7 +75,7 @@ TEST(NonConstSubscriptions, oneNonConstSubscriber)
   pub.publish(msg);
   ros::spinOnce();
 
-  ASSERT_TRUE(h.message_);
+  ASSERT_TRUE(h.message_ != nullptr);
   EXPECT_EQ(h.message_, msg);
 }
 
@@ -92,7 +92,7 @@ TEST(NonConstSubscriptions, oneConstOneNonConst)
   pub.publish(msg);
   ros::spinOnce();
 
-  ASSERT_TRUE(h.message_);
+  ASSERT_TRUE(h.message_ != nullptr);
   EXPECT_NE(h.message_, msg);
   EXPECT_EQ(h2.message_, msg);
 }
@@ -110,7 +110,7 @@ TEST(NonConstSubscriptions, twoNonConst)
   pub.publish(msg);
   ros::spinOnce();
 
-  ASSERT_TRUE(h.message_);
+  ASSERT_TRUE(h.message_ != nullptr);
   EXPECT_NE(h.message_, msg);
 }
 
@@ -127,7 +127,7 @@ TEST(NonConstSubscriptions, twoConst)
   pub.publish(msg);
   ros::spinOnce();
 
-  ASSERT_TRUE(h.message_);
+  ASSERT_TRUE(h.message_ != nullptr);
   EXPECT_EQ(h.message_, msg);
   EXPECT_EQ(h2.message_, msg);
 }

diff --git a/test/test_roscpp/test/src/wait_for_message.cpp b/test/test_roscpp/test/src/wait_for_message.cpp
@@ -50,7 +50,7 @@ TEST(Roscpp, waitForMessage)
   ros::Publisher pub = nh.advertise<TestArray>("test", 1, true);
   pub.publish(TestArray());
   TestArrayConstPtr msg = topic::waitForMessage<TestArray>("test");
-  ASSERT_TRUE(msg);
+  ASSERT_TRUE(msg != nullptr);
 }
 
 TEST(Roscpp, waitForMessageWithTimeout)

diff --git a/test/test_roscpp/test/test_callback_queue.cpp b/test/test_roscpp/test/test_callback_queue.cpp
@@ -439,9 +439,8 @@ void ConditionObject::add()
 {
   while(!condition_stop.load())
   {
-    if(condition_sync.load())
+    if(condition_sync.load() && queue->isEmpty())
     {
-      condition_sync.store(false);
       condition_one.store(true);
       id++;
       queue->addCallback(boost::make_shared<RaceConditionCallback>(this, &id), id);
@@ -458,6 +457,7 @@ TEST(CallbackQueue, raceConditionCallback)
   boost::thread t(boost::bind(&ConditionObject::add, &condition_object));
   for(unsigned int i = 0; i < 1000000; ++i)
   {
+    condition_object.condition_sync.store(false);
     if (queue.callOne() == CallbackQueue::Called)
     {
       if(condition_object.condition_one.load())

diff --git a/tools/rosbag/CMakeLists.txt b/tools/rosbag/CMakeLists.txt
@@ -11,6 +11,8 @@ find_package(BZip2 REQUIRED)
 
 catkin_python_setup()
 
+# set(CMAKE_BUILD_TYPE Debug)
+
 # Support large bags (>2GB) on 32-bit systems
 add_definitions(-D_FILE_OFFSET_BITS=64)
 

diff --git a/tools/rosmsg/package.xml b/tools/rosmsg/package.xml
@@ -27,6 +27,7 @@
   <run_depend>roslib</run_depend>
 
   <test_depend>std_msgs</test_depend>
+  <test_depend>test_rosmaster</test_depend>
 
   <export>
     <rosdoc config="rosdoc.yaml"/>

diff --git a/utilities/message_filters/test/test_approximate_time_policy.cpp b/utilities/message_filters/test/test_approximate_time_policy.cpp
@@ -106,8 +106,8 @@ class ApproximateTimeSynchronizerTest
   {
     //printf("Call_back called\n");
     //printf("Call back: <%f, %f>\n", p->header.stamp.toSec(), q->header.stamp.toSec());
-    ASSERT_TRUE(p);
-    ASSERT_TRUE(q);
+    ASSERT_TRUE(p != nullptr);
+    ASSERT_TRUE(q != nullptr);
     ASSERT_LT(output_position_, output_.size());
     EXPECT_EQ(output_[output_position_].first, p->header.stamp);
     EXPECT_EQ(output_[output_position_].second, q->header.stamp);
@@ -164,10 +164,10 @@ class ApproximateTimeSynchronizerTestQuad
   {
     //printf("Call_back called\n");
     //printf("Call back: <%f, %f>\n", p->header.stamp.toSec(), q->header.stamp.toSec());
-    ASSERT_TRUE(p);
-    ASSERT_TRUE(q);
-    ASSERT_TRUE(r);
-    ASSERT_TRUE(s);
+    ASSERT_TRUE(p != nullptr);
+    ASSERT_TRUE(q != nullptr);
+    ASSERT_TRUE(r != nullptr);
+    ASSERT_TRUE(s != nullptr);
     ASSERT_LT(output_position_, output_.size());
     EXPECT_EQ(output_[output_position_].time[0], p->header.stamp);
     EXPECT_EQ(output_[output_position_].time[1], q->header.stamp);

diff --git a/utilities/message_filters/test/test_chain.cpp b/utilities/message_filters/test/test_chain.cpp
@@ -148,7 +148,7 @@ TEST(Chain, retrieveFilter)
 
   c.addFilter(boost::make_shared<PassThrough<Msg> >());
 
-  ASSERT_TRUE(c.getFilter<PassThrough<Msg> >(0));
+  ASSERT_TRUE(c.getFilter<PassThrough<Msg> >(0) != nullptr);
   ASSERT_FALSE(c.getFilter<PassThrough<Msg> >(1));
 }
 
@@ -161,7 +161,7 @@ TEST(Chain, retrieveFilterThroughBaseClass)
 
   c.addFilter(boost::make_shared<PassThrough<Msg> >());
 
-  ASSERT_TRUE(cb->getFilter<PassThrough<Msg> >(0));
+  ASSERT_TRUE(cb->getFilter<PassThrough<Msg> >(0) != nullptr);
   ASSERT_FALSE(cb->getFilter<PassThrough<Msg> >(1));
 }
 
@@ -174,8 +174,8 @@ TEST(Chain, retrieveBaseClass)
 {
   Chain<Msg> c;
   c.addFilter(boost::make_shared<PTDerived>());
-  ASSERT_TRUE(c.getFilter<PassThrough<Msg> >(0));
-  ASSERT_TRUE(c.getFilter<PTDerived>(0));
+  ASSERT_TRUE(c.getFilter<PassThrough<Msg> >(0) != nullptr);
+  ASSERT_TRUE(c.getFilter<PTDerived>(0) != nullptr);
 }
 
 int main(int argc, char **argv){

diff --git a/utilities/message_filters/test/test_exact_time_policy.cpp b/utilities/message_filters/test/test_exact_time_policy.cpp
@@ -187,8 +187,8 @@ TEST(ExactTime, eventInEventOut)
   sync.add<0>(evt);
   sync.add<1>(evt);
 
-  ASSERT_TRUE(h.e1_.getMessage());
-  ASSERT_TRUE(h.e2_.getMessage());
+  ASSERT_TRUE(h.e1_.getMessage() != nullptr);
+  ASSERT_TRUE(h.e2_.getMessage() != nullptr);
   ASSERT_EQ(h.e1_.getReceiptTime(), evt.getReceiptTime());
   ASSERT_EQ(h.e2_.getReceiptTime(), evt.getReceiptTime());
 }

diff --git a/utilities/message_filters/test/test_subscriber.cpp b/utilities/message_filters/test/test_subscriber.cpp
@@ -152,7 +152,7 @@ TEST(Subscriber, singleNonConstCallback)
 
   ros::spinOnce();
 
-  ASSERT_TRUE(h.msg_);
+  ASSERT_TRUE(h.msg_ != nullptr);
   ASSERT_EQ(msg.get(), h.msg_.get());
 }
 
@@ -169,8 +169,8 @@ TEST(Subscriber, multipleNonConstCallbacksFilterSubscriber)
 
   ros::spinOnce();
 
-  ASSERT_TRUE(h.msg_);
-  ASSERT_TRUE(h2.msg_);
+  ASSERT_TRUE(h.msg_ != nullptr);
+  ASSERT_TRUE(h2.msg_ != nullptr);
   EXPECT_NE(msg.get(), h.msg_.get());
   EXPECT_NE(msg.get(), h2.msg_.get());
   EXPECT_NE(h.msg_.get(), h2.msg_.get());
@@ -189,8 +189,8 @@ TEST(Subscriber, multipleCallbacksSomeFilterSomeDirect)
 
   ros::spinOnce();
 
-  ASSERT_TRUE(h.msg_);
-  ASSERT_TRUE(h2.msg_);
+  ASSERT_TRUE(h.msg_ != nullptr);
+  ASSERT_TRUE(h2.msg_ != nullptr);
   EXPECT_NE(msg.get(), h.msg_.get());
   EXPECT_NE(msg.get(), h2.msg_.get());
   EXPECT_NE(h.msg_.get(), h2.msg_.get());

diff --git a/utilities/message_filters/test/time_synchronizer_unittest.cpp b/utilities/message_filters/test/time_synchronizer_unittest.cpp
@@ -516,8 +516,8 @@ TEST(TimeSynchronizer, eventInEventOut)
   sync.add<0>(evt);
   sync.add<1>(evt);
 
-  ASSERT_TRUE(h.e1_.getMessage());
-  ASSERT_TRUE(h.e2_.getMessage());
+  ASSERT_TRUE(h.e1_.getMessage() != nullptr);
+  ASSERT_TRUE(h.e2_.getMessage() != nullptr);
   ASSERT_EQ(h.e1_.getReceiptTime(), evt.getReceiptTime());
   ASSERT_EQ(h.e2_.getReceiptTime(), evt.getReceiptTime());
 }