Merge changes Idd20d965,I27e2c7d8 into main

* changes:
  tests: fix deprecated of googletest macro use
  tests: ignore deprecated uses in rapidcheck

tests/unit/libexpr-support/tests/value/context.cc

@@ -1,4 +1,7 @@
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #include <rapidcheck.h>
+#pragma GCC diagnostic pop
 
 #include "tests/path.hh"
 #include "tests/value/context.hh"

tests/unit/libexpr/attr-path.cc

@@ -2,10 +2,13 @@
 #include "lix/libexpr/attr-set.hh"
 #include "tests/libexpr.hh"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #include <rapidcheck/gen/Arbitrary.h>
 #include <rapidcheck/gen/Container.h>
 #include <rapidcheck/gen/Predicate.h>
 #include <rapidcheck/gtest.h>
+#pragma GCC diagnostic pop
 
 namespace nix {
 

tests/unit/libexpr/derived-path.cc

@@ -1,5 +1,8 @@
 #include <gtest/gtest.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #include <rapidcheck/gtest.h>
+#pragma GCC diagnostic pop
 
 #include "tests/derived-path.hh"
 #include "tests/libexpr.hh"

tests/unit/libexpr/value/context.cc

@@ -1,5 +1,8 @@
 #include <gtest/gtest.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #include <rapidcheck/gtest.h>
+#pragma GCC diagnostic pop
 
 #include "tests/path.hh"
 #include "tests/libexpr.hh"

tests/unit/libstore-support/tests/derived-path.cc

@@ -1,6 +1,9 @@
 #include <regex>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #include <rapidcheck.h>
+#pragma GCC diagnostic pop
 
 #include "tests/derived-path.hh"
 

tests/unit/libstore-support/tests/outputs-spec.cc

@@ -1,6 +1,9 @@
 #include "tests/outputs-spec.hh"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #include <rapidcheck.h>
+#pragma GCC diagnostic pop
 
 namespace rc {
 using namespace nix;

tests/unit/libstore-support/tests/outputs-spec.hh

@@ -1,7 +1,10 @@
 #pragma once
 ///@file
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #include <rapidcheck/gen/Arbitrary.h>
+#pragma GCC diagnostic pop
 
 #include "lix/libstore/outputs-spec.hh"
 

tests/unit/libstore-support/tests/path.cc

@@ -1,7 +1,10 @@
-#include <rapidcheck/gen/Arbitrary.h>
 #include <regex>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#include <rapidcheck/gen/Arbitrary.h>
 #include <rapidcheck.h>
+#pragma GCC diagnostic pop
 
 #include "lix/libstore/path-regex.hh"
 #include "lix/libstore/store-api.hh"

tests/unit/libstore-support/tests/path.hh

@@ -1,7 +1,10 @@
 #pragma once
 ///@file
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #include <rapidcheck/gen/Arbitrary.h>
+#pragma GCC diagnostic pop
 
 #include "lix/libstore/path.hh"
 

tests/unit/libstore/derived-path.cc

@@ -1,7 +1,10 @@
 #include <regex>
 
 #include <gtest/gtest.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #include <rapidcheck/gtest.h>
+#pragma GCC diagnostic pop
 
 #include "tests/derived-path.hh"
 #include "tests/libstore.hh"

tests/unit/libstore/path.cc

@@ -1,7 +1,10 @@
 #include <regex>
 
 #include <gtest/gtest.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #include <rapidcheck/gtest.h>
+#pragma GCC diagnostic pop
 
 #include "lix/libstore/path-regex.hh"
 #include "lix/libstore/store-api.hh"

tests/unit/libutil-support/tests/hash.cc

@@ -1,7 +1,10 @@
 // required due to rapidcheck generating an incomplete-return-type error due to
 // missing include on libc++ on macOS
 #include <exception> // IWYU pragma: keep
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #include <rapidcheck.h>
+#pragma GCC diagnostic pop
 
 #include "hash.hh"
 

tests/unit/libutil/checked-arithmetic.cc

@@ -1,9 +1,12 @@
 #include <cstdint>
 #include <gtest/gtest.h>
 #include <limits>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #include <rapidcheck/Assertions.h>
 #include <rapidcheck/gtest.h>
 #include <rapidcheck/gen/Arbitrary.hpp>
+#pragma GCC diagnostic pop
 
 #include "lix/libutil/checked-arithmetic.hh"
 

tests/unit/libutil/references.cc

@@ -30,7 +30,7 @@ TEST_P(RewriteTest, IdentityRewriteIsIdentity) {
     ASSERT_EQ(RewritingSource(param.rewrites, src).drain(), param.finalString);
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     references,
     RewriteTest,
     ::testing::Values(