[Bf-blender-cvs] [10d61f34bb8] master: Fix clang tidy errors in tests

Jacques Lucke noreply at git.blender.org
Thu Sep 3 16:27:12 CEST 2020


Commit: 10d61f34bb8df4008cf96b748f8cd38b4665443c
Author: Jacques Lucke
Date:   Thu Sep 3 16:26:40 2020 +0200
Branches: master
https://developer.blender.org/rB10d61f34bb8df4008cf96b748f8cd38b4665443c

Fix clang tidy errors in tests

===================================================================

M	source/blender/blenlib/tests/BLI_map_test.cc
M	source/blender/blenlib/tests/BLI_set_test.cc

===================================================================

diff --git a/source/blender/blenlib/tests/BLI_map_test.cc b/source/blender/blenlib/tests/BLI_map_test.cc
index 7b4a484e736..91c6335b949 100644
--- a/source/blender/blenlib/tests/BLI_map_test.cc
+++ b/source/blender/blenlib/tests/BLI_map_test.cc
@@ -498,7 +498,7 @@ TEST(map, MoveConstructorExceptions)
   map.add(2, 2);
   map.lookup(1).throw_during_move = true;
   EXPECT_ANY_THROW({ MapType map_moved(std::move(map)); });
-  map.add(5, 5);
+  map.add(5, 5); /* NOLINT: bugprone-use-after-move */
 }
 
 TEST(map, AddNewExceptions)
@@ -532,7 +532,7 @@ TEST(map, PopExceptions)
   Map<ExceptionThrower, ExceptionThrower> map;
   map.add(3, 3);
   map.lookup(3).throw_during_move = true;
-  EXPECT_ANY_THROW({ map.pop(3); });
+  EXPECT_ANY_THROW({ map.pop(3); }); /* NOLINT: bugprone-throw-keyword-missing */
   EXPECT_EQ(map.size(), 1);
   map.add(1, 1);
   EXPECT_EQ(map.size(), 2);
diff --git a/source/blender/blenlib/tests/BLI_set_test.cc b/source/blender/blenlib/tests/BLI_set_test.cc
index 3ea9a59b3db..bf49bfb611b 100644
--- a/source/blender/blenlib/tests/BLI_set_test.cc
+++ b/source/blender/blenlib/tests/BLI_set_test.cc
@@ -485,7 +485,7 @@ TEST(set, MoveConstructorExceptions)
   SetType set = {1, 2, 3};
   set.lookup_key(2).throw_during_move = true;
   EXPECT_ANY_THROW({ SetType set_moved(std::move(set)); });
-  EXPECT_EQ(set.size(), 0);
+  EXPECT_EQ(set.size(), 0); /* NOLINT: bugprone-use-after-move */
   set.add_multiple({3, 6, 7});
   EXPECT_EQ(set.size(), 3);
 }



More information about the Bf-blender-cvs mailing list