Skip to content

Commit d2da09a

Browse files
Abseil Teamdinord
Abseil Team
authored andcommitted
Export of internal Abseil changes
-- 7fbe730c56c0890f27df47f9ad4f0cfa600c6ad9 by Derek Mauro <[email protected]>: Internal change PiperOrigin-RevId: 424639048 -- 1825fcf704e45e881cdd1d2fe3eb2226f523f3cd by Derek Mauro <[email protected]>: Disable tests Table.EnsureNonQuadraticTopNXorSeedByProbeSeqLength and Table.EnsureNonQuadraticTopNLinearTransformByProbeSeqLength again as they are (still) flaky PiperOrigin-RevId: 424616745 -- e624119171d9bceec2f6df023b220a6642070cfb by Abseil Team <[email protected]>: Switch from *_TEST_CASE_P to *_TEST_SUITE_P gtest macros. PiperOrigin-RevId: 424404790 -- a110698c10554fb1f640412db8cd7c5a38b7b8e8 by Abseil Team <[email protected]>: Remove extraneous newline in documentation. PiperOrigin-RevId: 424328502 GitOrigin-RevId: 7fbe730c56c0890f27df47f9ad4f0cfa600c6ad9 Change-Id: I56fd8c7cecf65fe37cb4cf2dde70842867d637d7
1 parent 4862fe5 commit d2da09a

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

absl/container/internal/raw_hash_set_test.cc

+4-2
Original file line numberDiff line numberDiff line change
@@ -1258,7 +1258,8 @@ ExpectedStats XorSeedExpectedStats() {
12581258
return {};
12591259
}
12601260

1261-
TEST(Table, EnsureNonQuadraticTopNXorSeedByProbeSeqLength) {
1261+
// TODO(b/80415403): Figure out why this test is so flaky, esp. on MSVC
1262+
TEST(Table, DISABLED_EnsureNonQuadraticTopNXorSeedByProbeSeqLength) {
12621263
ProbeStatsPerSize stats;
12631264
std::vector<size_t> sizes = {Group::kWidth << 5, Group::kWidth << 10};
12641265
for (size_t size : sizes) {
@@ -1352,7 +1353,8 @@ ExpectedStats LinearTransformExpectedStats() {
13521353
return {};
13531354
}
13541355

1355-
TEST(Table, EnsureNonQuadraticTopNLinearTransformByProbeSeqLength) {
1356+
// TODO(b/80415403): Figure out why this test is so flaky.
1357+
TEST(Table, DISABLED_EnsureNonQuadraticTopNLinearTransformByProbeSeqLength) {
13561358
ProbeStatsPerSize stats;
13571359
std::vector<size_t> sizes = {Group::kWidth << 5, Group::kWidth << 10};
13581360
for (size_t size : sizes) {

absl/hash/hash_test.cc

+12-12
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@ TYPED_TEST_P(HashValueIntTest, FastPath) {
139139
absl::Hash<std::tuple<TypeParam>>{}(std::tuple<TypeParam>(n)));
140140
}
141141

142-
REGISTER_TYPED_TEST_CASE_P(HashValueIntTest, BasicUsage, FastPath);
142+
REGISTER_TYPED_TEST_SUITE_P(HashValueIntTest, BasicUsage, FastPath);
143143
using IntTypes = testing::Types<unsigned char, char, int, int32_t, int64_t,
144144
uint32_t, uint64_t, size_t>;
145-
INSTANTIATE_TYPED_TEST_CASE_P(My, HashValueIntTest, IntTypes);
145+
INSTANTIATE_TYPED_TEST_SUITE_P(My, HashValueIntTest, IntTypes);
146146

147147
enum LegacyEnum { kValue1, kValue2, kValue3 };
148148

@@ -507,15 +507,15 @@ TYPED_TEST_P(HashValueSequenceTest, BasicUsage) {
507507
EXPECT_TRUE(absl::VerifyTypeImplementsAbslHashCorrectly(exemplars));
508508
}
509509

510-
REGISTER_TYPED_TEST_CASE_P(HashValueSequenceTest, BasicUsage);
510+
REGISTER_TYPED_TEST_SUITE_P(HashValueSequenceTest, BasicUsage);
511511
using IntSequenceTypes = testing::Types<
512512
std::deque<int>, std::forward_list<int>, std::list<int>, std::vector<int>,
513513
std::vector<bool>, TypeErasedContainer<std::vector<int>>, std::set<int>,
514514
std::multiset<int>, UnorderedSequence<int>,
515515
TypeErasedContainer<UnorderedSequence<int>>, std::unordered_set<int>,
516516
std::unordered_multiset<int>, absl::flat_hash_set<int>,
517517
absl::node_hash_set<int>, absl::btree_set<int>>;
518-
INSTANTIATE_TYPED_TEST_CASE_P(My, HashValueSequenceTest, IntSequenceTypes);
518+
INSTANTIATE_TYPED_TEST_SUITE_P(My, HashValueSequenceTest, IntSequenceTypes);
519519

520520
template <typename T>
521521
class HashValueNestedSequenceTest : public testing::Test {};
@@ -541,7 +541,7 @@ TYPED_TEST_P(HashValueNestedSequenceTest, BasicUsage) {
541541
EXPECT_TRUE(absl::VerifyTypeImplementsAbslHashCorrectly(exemplars));
542542
}
543543

544-
REGISTER_TYPED_TEST_CASE_P(HashValueNestedSequenceTest, BasicUsage);
544+
REGISTER_TYPED_TEST_SUITE_P(HashValueNestedSequenceTest, BasicUsage);
545545
template <typename T>
546546
using TypeErasedSet = TypeErasedContainer<UnorderedSequence<T>>;
547547

@@ -551,7 +551,7 @@ using NestedIntSequenceTypes = testing::Types<
551551
UnorderedSequence<UnorderedSequence<int>>,
552552
UnorderedSequence<TypeErasedSet<int>>, TypeErasedSet<std::vector<int>>,
553553
TypeErasedSet<UnorderedSequence<int>>, TypeErasedSet<TypeErasedSet<int>>>;
554-
INSTANTIATE_TYPED_TEST_CASE_P(My, HashValueNestedSequenceTest,
554+
INSTANTIATE_TYPED_TEST_SUITE_P(My, HashValueNestedSequenceTest,
555555
NestedIntSequenceTypes);
556556

557557
// Private type that only supports AbslHashValue to make sure our chosen hash
@@ -732,13 +732,13 @@ TYPED_TEST_P(HashValueAssociativeMapTest, BasicUsage) {
732732
EXPECT_TRUE(absl::VerifyTypeImplementsAbslHashCorrectly(exemplars));
733733
}
734734

735-
REGISTER_TYPED_TEST_CASE_P(HashValueAssociativeMapTest, BasicUsage);
735+
REGISTER_TYPED_TEST_SUITE_P(HashValueAssociativeMapTest, BasicUsage);
736736
using AssociativeMapTypes = testing::Types<
737737
std::map<int, std::string>, std::unordered_map<int, std::string>,
738738
absl::flat_hash_map<int, std::string>,
739739
absl::node_hash_map<int, std::string>, absl::btree_map<int, std::string>,
740740
UnorderedSequence<std::pair<const int, std::string>>>;
741-
INSTANTIATE_TYPED_TEST_CASE_P(My, HashValueAssociativeMapTest,
741+
INSTANTIATE_TYPED_TEST_SUITE_P(My, HashValueAssociativeMapTest,
742742
AssociativeMapTypes);
743743

744744
template <typename T>
@@ -763,11 +763,11 @@ TYPED_TEST_P(HashValueAssociativeMultimapTest, BasicUsage) {
763763
EXPECT_TRUE(absl::VerifyTypeImplementsAbslHashCorrectly(exemplars));
764764
}
765765

766-
REGISTER_TYPED_TEST_CASE_P(HashValueAssociativeMultimapTest, BasicUsage);
766+
REGISTER_TYPED_TEST_SUITE_P(HashValueAssociativeMultimapTest, BasicUsage);
767767
using AssociativeMultimapTypes =
768768
testing::Types<std::multimap<int, std::string>,
769769
std::unordered_multimap<int, std::string>>;
770-
INSTANTIATE_TYPED_TEST_CASE_P(My, HashValueAssociativeMultimapTest,
770+
INSTANTIATE_TYPED_TEST_SUITE_P(My, HashValueAssociativeMultimapTest,
771771
AssociativeMultimapTypes);
772772

773773
TEST(HashValueTest, ReferenceWrapper) {
@@ -1007,10 +1007,10 @@ TYPED_TEST_P(HashIntTest, BasicUsage) {
10071007
Hash<CombineVariadic<TypeParam>>()({}));
10081008
}
10091009

1010-
REGISTER_TYPED_TEST_CASE_P(HashIntTest, BasicUsage);
1010+
REGISTER_TYPED_TEST_SUITE_P(HashIntTest, BasicUsage);
10111011
using IntTypes = testing::Types<unsigned char, char, int, int32_t, int64_t,
10121012
uint32_t, uint64_t, size_t>;
1013-
INSTANTIATE_TYPED_TEST_CASE_P(My, HashIntTest, IntTypes);
1013+
INSTANTIATE_TYPED_TEST_SUITE_P(My, HashIntTest, IntTypes);
10141014

10151015
struct StructWithPadding {
10161016
char c;

absl/strings/internal/str_format/checker.h

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
// Compile time check support for entry points.
2323

2424
#ifndef ABSL_INTERNAL_ENABLE_FORMAT_CHECKER
25-
2625
// We disable format checker under vscode intellisense compilation.
2726
// See https://github.com/microsoft/vscode-cpptools/issues/3683 for
2827
// more details.

absl/strings/str_split.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -461,8 +461,7 @@ using EnableSplitIfString =
461461
// first two split strings become the `std::pair` `.first` and `.second`
462462
// members, respectively. The remaining split substrings are discarded. If there
463463
// are less than two split substrings, the empty string is used for the
464-
// corresponding
465-
// `std::pair` member.
464+
// corresponding `std::pair` member.
466465
//
467466
// Example:
468467
//

0 commit comments

Comments
 (0)