[compiler-rt] cb84665 - [compiler-rt] Fix deprection warnings on INSTANTIATE_TEST_CASE_P

[Benjamin Kramer via llvm-commits]

Author: Benjamin Kramer
Date: 2021-05-15T00:24:02+02:00
New Revision: cb846654c63b6bf35a0fd1629b86e0f1f78a9d55

URL: https://github.com/llvm/llvm-project/commit/cb846654c63b6bf35a0fd1629b86e0f1f78a9d55
DIFF: https://github.com/llvm/llvm-project/commit/cb846654c63b6bf35a0fd1629b86e0f1f78a9d55.diff

LOG: [compiler-rt] Fix deprection warnings on INSTANTIATE_TEST_CASE_P

Added: 
    

Modified: 
    compiler-rt/lib/msan/tests/msan_test.cpp
    compiler-rt/lib/sanitizer_common/tests/sanitizer_common_test.cpp
    compiler-rt/lib/sanitizer_common/tests/sanitizer_libc_test.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/msan/tests/msan_test.cpp b/compiler-rt/lib/msan/tests/msan_test.cpp
index 552f7b9eb9d0f..b382f38364277 100644
--- a/compiler-rt/lib/msan/tests/msan_test.cpp
+++ b/compiler-rt/lib/msan/tests/msan_test.cpp
@@ -976,8 +976,8 @@ std::vector<int> GetAvailableIpSocketFamilies() {
   return result;
 }
 
-INSTANTIATE_TEST_CASE_P(IpTests, MemorySanitizerIpTest,
-                        ::testing::ValuesIn(GetAvailableIpSocketFamilies()));
+INSTANTIATE_TEST_SUITE_P(IpTests, MemorySanitizerIpTest,
+                         ::testing::ValuesIn(GetAvailableIpSocketFamilies()));
 
 TEST_P(MemorySanitizerIpTest, accept) {
   int listen_socket = CreateSocket(SOCK_STREAM);

diff  --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_common_test.cpp b/compiler-rt/lib/sanitizer_common/tests/sanitizer_common_test.cpp
index 80df9b497b2df..a6631bef64b71 100644
--- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_common_test.cpp
+++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_common_test.cpp
@@ -295,8 +295,8 @@ const std::vector<int> kSortAndDedupTests[] = {
     {1, 2, 1, 1, 2, 1, 1, 1, 2, 2},
     {1, 3, 3, 2, 3, 1, 3, 1, 4, 4, 2, 1, 4, 1, 1, 2, 2},
 };
-INSTANTIATE_TEST_CASE_P(SortAndDedupTest, SortAndDedupTest,
-                        ::testing::ValuesIn(kSortAndDedupTests));
+INSTANTIATE_TEST_SUITE_P(SortAndDedupTest, SortAndDedupTest,
+                         ::testing::ValuesIn(kSortAndDedupTests));
 
 #if SANITIZER_LINUX && !SANITIZER_ANDROID
 TEST(SanitizerCommon, FindPathToBinary) {

diff  --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_libc_test.cpp b/compiler-rt/lib/sanitizer_common/tests/sanitizer_libc_test.cpp
index c3fddc57fe693..863a4332105ae 100644
--- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_libc_test.cpp
+++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_libc_test.cpp
@@ -218,9 +218,9 @@ TEST_P(SanitizerCommonFileTest, ReadFileToVectorHalf) {
   EXPECT_EQ(data_, std::vector<char>(buff.begin(), buff.end()));
 }
 
-INSTANTIATE_TEST_CASE_P(FileSizes, SanitizerCommonFileTest,
-                        ::testing::Values(0, 1, 7, 13, 32, 4096, 4097, 1048575,
-                                          1048576, 1048577));
+INSTANTIATE_TEST_SUITE_P(FileSizes, SanitizerCommonFileTest,
+                         ::testing::Values(0, 1, 7, 13, 32, 4096, 4097, 1048575,
+                                           1048576, 1048577));
 
 static const size_t kStrlcpyBufSize = 8;
 void test_internal_strlcpy(char *dbuf, const char *sbuf) {