Parcourir la source

[master] Fixed build failure showing up on Redhat linux.

Use std::equal instead of EXPECT_EQ on vectors.
Marcin Siodelski il y a 8 ans
Parent
commit
665f87a7cf
1 fichiers modifiés avec 5 ajouts et 2 suppressions
  1. 5 2
      src/bin/dhcp4/tests/classify_unittest.cc

+ 5 - 2
src/bin/dhcp4/tests/classify_unittest.cc

@@ -10,6 +10,7 @@
 #include <dhcp/tests/iface_mgr_test_config.h>
 #include <dhcp4/tests/dhcp4_client.h>
 #include <dhcp/option_int.h>
+#include <algorithm>
 #include <vector>
 
 using namespace isc;
@@ -142,13 +143,15 @@ public:
          ASSERT_GE(max_sname, exp_sname.length());
          vector<uint8_t> sname(max_sname, 0);
          memcpy(&sname[0], &exp_sname[0], exp_sname.size());
-         EXPECT_EQ(sname, resp->getSname());
+         EXPECT_TRUE(std::equal(sname.begin(), sname.end(),
+                                resp->getSname().begin()));
 
          const size_t max_filename = Pkt4::MAX_FILE_LEN;
          ASSERT_GE(max_filename, exp_filename.length());
          vector<uint8_t> filename(max_filename, 0);
          memcpy(&filename[0], &exp_filename[0], exp_filename.size());
-         EXPECT_EQ(filename, resp->getFile());
+         EXPECT_TRUE(std::equal(filename.begin(), filename.end(),
+                                resp->getFile().begin()));
     }
 
     /// @brief Interface Manager's fake configuration control.