Merge pull request #929 from vinser52/svinogra.minor_fixes

bratpiorka · web-flow · commit 7ef936cc6e0a · 2024-11-25T08:47:37.000+01:00
Fix unreachable code error when Sanitazer is enabled
diff --git a/test/poolFixtures.hpp b/test/poolFixtures.hpp
@@ -467,7 +467,7 @@ TEST_P(umfPoolTest, mallocUsableSize) {
     // Sanitizer replaces malloc_usable_size implementation with its own
     GTEST_SKIP()
         << "This test is invalid with AddressSanitizer instrumentation";
-#endif
+#else
 
     for (size_t allocSize : {32, 48, 1024, 8192}) {
         char *ptr = static_cast<char *>(umfPoolMalloc(pool.get(), allocSize));
@@ -482,6 +482,7 @@ TEST_P(umfPoolTest, mallocUsableSize) {
 
         umfPoolFree(pool.get(), ptr);
     }
+#endif
 }
 
 #endif /* UMF_TEST_POOL_FIXTURES_HPP */

Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ TEST_P(umfPoolTest, mallocUsableSize) {`
`467`	`467`	`// Sanitizer replaces malloc_usable_size implementation with its own`
`468`	`468`	`GTEST_SKIP()`
`469`	`469`	`<< "This test is invalid with AddressSanitizer instrumentation";`
`470`		`-#endif`
	`470`	`+#else`
`471`	`471`
`472`	`472`	`for (size_t allocSize : {32, 48, 1024, 8192}) {`
`473`	`473`	`char ptr = static_cast<char >(umfPoolMalloc(pool.get(), allocSize));`
`@@ -482,6 +482,7 @@ TEST_P(umfPoolTest, mallocUsableSize) {`
`482`	`482`
`483`	`483`	`umfPoolFree(pool.get(), ptr);`
`484`	`484`	`}`
	`485`	`+#endif`
`485`	`486`	`}`
`486`	`487`
`487`	`488`	`#endif /* UMF_TEST_POOL_FIXTURES_HPP */`