From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-ros/message_filters/files/tests.patch | 132 ------------------------------ 1 file changed, 132 deletions(-) delete mode 100644 dev-ros/message_filters/files/tests.patch (limited to 'dev-ros/message_filters/files') diff --git a/dev-ros/message_filters/files/tests.patch b/dev-ros/message_filters/files/tests.patch deleted file mode 100644 index 2861213235e6..000000000000 --- a/dev-ros/message_filters/files/tests.patch +++ /dev/null @@ -1,132 +0,0 @@ -Index: message_filters/test/test_approximate_time_policy.cpp -=================================================================== ---- message_filters.orig/test/test_approximate_time_policy.cpp -+++ message_filters/test/test_approximate_time_policy.cpp -@@ -106,8 +106,8 @@ public: - { - //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!=NULL); -+ ASSERT_TRUE(q!=NULL); - 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 @@ public: - { - //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!=NULL); -+ ASSERT_TRUE(q!=NULL); -+ ASSERT_TRUE(r!=NULL); -+ ASSERT_TRUE(s!=NULL); - 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); -Index: message_filters/test/test_chain.cpp -=================================================================== ---- message_filters.orig/test/test_chain.cpp -+++ message_filters/test/test_chain.cpp -@@ -148,8 +148,8 @@ TEST(Chain, retrieveFilter) - - c.addFilter(boost::make_shared >()); - -- ASSERT_TRUE(c.getFilter >(0)); -- ASSERT_FALSE(c.getFilter >(1)); -+ ASSERT_TRUE(c.getFilter >(0) != NULL); -+ ASSERT_FALSE(c.getFilter >(1) != NULL); - } - - TEST(Chain, retrieveFilterThroughBaseClass) -@@ -161,8 +161,8 @@ TEST(Chain, retrieveFilterThroughBaseCla - - c.addFilter(boost::make_shared >()); - -- ASSERT_TRUE(cb->getFilter >(0)); -- ASSERT_FALSE(cb->getFilter >(1)); -+ ASSERT_TRUE(cb->getFilter >(0) != NULL); -+ ASSERT_FALSE(cb->getFilter >(1) != NULL); - } - - struct PTDerived : public PassThrough -@@ -174,8 +174,8 @@ TEST(Chain, retrieveBaseClass) - { - Chain c; - c.addFilter(boost::make_shared()); -- ASSERT_TRUE(c.getFilter >(0)); -- ASSERT_TRUE(c.getFilter(0)); -+ ASSERT_TRUE(c.getFilter >(0) != NULL); -+ ASSERT_TRUE(c.getFilter(0) != NULL); - } - - int main(int argc, char **argv){ -Index: message_filters/test/test_exact_time_policy.cpp -=================================================================== ---- message_filters.orig/test/test_exact_time_policy.cpp -+++ 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()!=NULL); -+ ASSERT_TRUE(h.e2_.getMessage()!=NULL); - ASSERT_EQ(h.e1_.getReceiptTime(), evt.getReceiptTime()); - ASSERT_EQ(h.e2_.getReceiptTime(), evt.getReceiptTime()); - } -Index: message_filters/test/test_subscriber.cpp -=================================================================== ---- message_filters.orig/test/test_subscriber.cpp -+++ message_filters/test/test_subscriber.cpp -@@ -152,7 +152,7 @@ TEST(Subscriber, singleNonConstCallback) - - ros::spinOnce(); - -- ASSERT_TRUE(h.msg_); -+ ASSERT_TRUE(h.msg_!=NULL); - ASSERT_EQ(msg.get(), h.msg_.get()); - } - -@@ -169,8 +169,8 @@ TEST(Subscriber, multipleNonConstCallbac - - ros::spinOnce(); - -- ASSERT_TRUE(h.msg_); -- ASSERT_TRUE(h2.msg_); -+ ASSERT_TRUE(h.msg_ !=NULL); -+ ASSERT_TRUE(h2.msg_!=NULL); - 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, multipleCallbacksSomeFi - - ros::spinOnce(); - -- ASSERT_TRUE(h.msg_); -- ASSERT_TRUE(h2.msg_); -+ ASSERT_TRUE(h.msg_ != NULL); -+ ASSERT_TRUE(h2.msg_!= NULL); - EXPECT_NE(msg.get(), h.msg_.get()); - EXPECT_NE(msg.get(), h2.msg_.get()); - EXPECT_NE(h.msg_.get(), h2.msg_.get()); -Index: message_filters/test/time_synchronizer_unittest.cpp -=================================================================== ---- message_filters.orig/test/time_synchronizer_unittest.cpp -+++ 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()!=NULL); -+ ASSERT_TRUE(h.e2_.getMessage()!=NULL); - ASSERT_EQ(h.e1_.getReceiptTime(), evt.getReceiptTime()); - ASSERT_EQ(h.e2_.getReceiptTime(), evt.getReceiptTime()); - } -- cgit v1.2.3