Skip to content

Commit 05de4b4

Browse files
d0kd0k
committed
Put back the trailing commas on TYPED_TEST_SUITE
This avoids a -pedantic warning: warning: ISO C++11 requires at least one argument for the "..." in a variadic macro See also google/googletest#2271
1 parent e35a9ec commit 05de4b4

19 files changed

+26
-26
lines changed

‎clang/unittests/StaticAnalyzer/RangeSetTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ llvm::APSInt RangeSetTest<BaseType>::Base{sizeof(BaseType) * 8, !isSigned()};
188188

189189
using IntTypes = ::testing::Types<int8_t, uint8_t, int16_t, uint16_t, int32_t,
190190
uint32_t, int64_t, uint64_t>;
191-
TYPED_TEST_SUITE(RangeSetTest, IntTypes);
191+
TYPED_TEST_SUITE(RangeSetTest, IntTypes, );
192192

193193
TYPED_TEST(RangeSetTest, RangeSetNegateTest) {
194194
// Use next values of the range {MIN, A, B, MID, C, D, MAX}.

‎flang/unittests/RuntimeGTest/CharacterTest.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ struct CharacterComparisonTests : public ::testing::Test {
111111
};
112112

113113
using CharacterTypes = ::testing::Types<char, char16_t, char32_t>;
114-
TYPED_TEST_SUITE(CharacterComparisonTests, CharacterTypes);
114+
TYPED_TEST_SUITE(CharacterComparisonTests, CharacterTypes, );
115115

116116
TYPED_TEST(CharacterComparisonTests, CompareCharacters) {
117117
for (auto &[x, y, xBytes, yBytes, expect] : this->parameters) {
@@ -204,7 +204,7 @@ void RunExtremumTests(const char *which,
204204
}
205205

206206
template <typename CHAR> struct ExtremumTests : public ::testing::Test {};
207-
TYPED_TEST_SUITE(ExtremumTests, CharacterTypes);
207+
TYPED_TEST_SUITE(ExtremumTests, CharacterTypes, );
208208

209209
TYPED_TEST(ExtremumTests, MinTests) {
210210
static std::vector<ExtremumTestCase> tests{
@@ -284,7 +284,7 @@ void RunSearchTests(const char *which,
284284
}
285285

286286
template <typename CHAR> struct SearchTests : public ::testing::Test {};
287-
TYPED_TEST_SUITE(SearchTests, CharacterTypes);
287+
TYPED_TEST_SUITE(SearchTests, CharacterTypes, );
288288

289289
TYPED_TEST(SearchTests, IndexTests) {
290290
static SearchFunctions functions{

‎llvm/unittests/ADT/BitVectorTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class BitVectorTest : public ::testing::Test { };
2121

2222
// Test both BitVector and SmallBitVector with the same suite of tests.
2323
typedef ::testing::Types<BitVector, SmallBitVector> BitVectorTestTypes;
24-
TYPED_TEST_SUITE(BitVectorTest, BitVectorTestTypes);
24+
TYPED_TEST_SUITE(BitVectorTest, BitVectorTestTypes, );
2525

2626
TYPED_TEST(BitVectorTest, TrivialOperation) {
2727
TypeParam Vec;

‎llvm/unittests/ADT/DenseMapTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ typedef ::testing::Types<DenseMap<uint32_t, uint32_t>,
105105
SmallDenseMap<CtorTester, CtorTester, 4,
106106
CtorTesterMapInfo>
107107
> DenseMapTestTypes;
108-
TYPED_TEST_SUITE(DenseMapTest, DenseMapTestTypes);
108+
TYPED_TEST_SUITE(DenseMapTest, DenseMapTestTypes, );
109109

110110
// Empty map tests
111111
TYPED_TEST(DenseMapTest, EmptyIntMapTest) {

‎llvm/unittests/ADT/DenseSetTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ typedef ::testing::Types<DenseSet<unsigned, TestDenseSetInfo>,
6868
const SmallDenseSet<unsigned, 4, TestDenseSetInfo>,
6969
SmallDenseSet<unsigned, 64, TestDenseSetInfo>>
7070
DenseSetTestTypes;
71-
TYPED_TEST_SUITE(DenseSetTest, DenseSetTestTypes);
71+
TYPED_TEST_SUITE(DenseSetTest, DenseSetTestTypes, );
7272

7373
TYPED_TEST(DenseSetTest, Constructor) {
7474
constexpr unsigned a[] = {1, 2, 4};

‎llvm/unittests/ADT/IListBaseTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ template <typename T> class IListBaseTest : public ::testing::Test {};
1919
// Test variants with the same test.
2020
typedef ::testing::Types<ilist_base<false>, ilist_base<true>>
2121
IListBaseTestTypes;
22-
TYPED_TEST_SUITE(IListBaseTest, IListBaseTestTypes);
22+
TYPED_TEST_SUITE(IListBaseTest, IListBaseTestTypes, );
2323

2424
TYPED_TEST(IListBaseTest, insertBeforeImpl) {
2525
typedef TypeParam list_base_type;

‎llvm/unittests/ADT/IntrusiveRefCntPtrTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ template <typename T> struct IntrusiveRefCntPtrTest : testing::Test {};
2828
typedef ::testing::Types<SimpleRefCounted<RefCountedBase>,
2929
SimpleRefCounted<ThreadSafeRefCountedBase>>
3030
IntrusiveRefCntTypes;
31-
TYPED_TEST_SUITE(IntrusiveRefCntPtrTest, IntrusiveRefCntTypes);
31+
TYPED_TEST_SUITE(IntrusiveRefCntPtrTest, IntrusiveRefCntTypes, );
3232

3333
TYPED_TEST(IntrusiveRefCntPtrTest, RefCountedBaseCopyDoesNotLeak) {
3434
EXPECT_EQ(0, NumInstances);

‎llvm/unittests/ADT/MapVectorTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ template <class IntType> struct MapVectorMappedTypeTest : ::testing::Test {
162162

163163
using MapIntTypes = ::testing::Types<int, long, long long, unsigned,
164164
unsigned long, unsigned long long>;
165-
TYPED_TEST_SUITE(MapVectorMappedTypeTest, MapIntTypes);
165+
TYPED_TEST_SUITE(MapVectorMappedTypeTest, MapIntTypes, );
166166

167167
TYPED_TEST(MapVectorMappedTypeTest, DifferentDenseMap) {
168168
// Test that using a map with a mapped type other than 'unsigned' compiles

‎llvm/unittests/ADT/PriorityWorklistTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ using namespace llvm;
2222
template <typename T> class PriorityWorklistTest : public ::testing::Test {};
2323
typedef ::testing::Types<PriorityWorklist<int>, SmallPriorityWorklist<int, 2>>
2424
TestTypes;
25-
TYPED_TEST_SUITE(PriorityWorklistTest, TestTypes);
25+
TYPED_TEST_SUITE(PriorityWorklistTest, TestTypes, );
2626

2727
TYPED_TEST(PriorityWorklistTest, Basic) {
2828
TypeParam W;

‎llvm/unittests/ADT/RangeAdapterTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ template <typename T> class RangeAdapterLValueTest : public ::testing::Test {};
129129

130130
typedef ::testing::Types<std::vector<int>, std::list<int>, int[4]>
131131
RangeAdapterLValueTestTypes;
132-
TYPED_TEST_SUITE(RangeAdapterLValueTest, RangeAdapterLValueTestTypes);
132+
TYPED_TEST_SUITE(RangeAdapterLValueTest, RangeAdapterLValueTestTypes, );
133133

134134
TYPED_TEST(RangeAdapterLValueTest, TrivialOperation) {
135135
TypeParam v = {0, 1, 2, 3};
@@ -145,7 +145,7 @@ typedef ::testing::Types<std::vector<int>, std::list<int>, CustomIteratorVector,
145145
ReverseOnlyVector, BidirectionalVector,
146146
BidirectionalVectorConsts>
147147
RangeAdapterRValueTestTypes;
148-
TYPED_TEST_SUITE(RangeAdapterRValueTest, RangeAdapterRValueTestTypes);
148+
TYPED_TEST_SUITE(RangeAdapterRValueTest, RangeAdapterRValueTestTypes, );
149149

150150
TYPED_TEST(RangeAdapterRValueTest, TrivialOperation) {
151151
TestRev(reverse(TypeParam({0, 1, 2, 3})));

‎llvm/unittests/ADT/STLForwardCompatTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ using STLForwardCompatRemoveCVRefTestTypes = ::testing::Types<
6060
>;
6161

6262
TYPED_TEST_SUITE(STLForwardCompatRemoveCVRefTest,
63-
STLForwardCompatRemoveCVRefTestTypes);
63+
STLForwardCompatRemoveCVRefTestTypes, );
6464

6565
TYPED_TEST(STLForwardCompatRemoveCVRefTest, RemoveCVRef) {
6666
using From = typename TypeParam::first_type;

‎llvm/unittests/ADT/SmallVectorTest.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ typedef ::testing::Types<SmallVector<Constructable, 0>,
208208
SmallVector<Constructable, 4>,
209209
SmallVector<Constructable, 5>
210210
> SmallVectorTestTypes;
211-
TYPED_TEST_SUITE(SmallVectorTest, SmallVectorTestTypes);
211+
TYPED_TEST_SUITE(SmallVectorTest, SmallVectorTestTypes, );
212212

213213
// Constructor test.
214214
TYPED_TEST(SmallVectorTest, ConstructorNonIterTest) {
@@ -811,7 +811,7 @@ typedef ::testing::Types<
811811
std::pair<SmallVector<Constructable, 2>, SmallVector<Constructable, 2>>
812812
> DualSmallVectorTestTypes;
813813

814-
TYPED_TEST_SUITE(DualSmallVectorsTest, DualSmallVectorTestTypes);
814+
TYPED_TEST_SUITE(DualSmallVectorsTest, DualSmallVectorTestTypes, );
815815

816816
TYPED_TEST(DualSmallVectorsTest, MoveAssignment) {
817817
SCOPED_TRACE("MoveAssignTest-DualVectorTypes");
@@ -1096,7 +1096,7 @@ using SmallVectorReferenceInvalidationTestTypes =
10961096
::testing::Types<SmallVector<int, 3>, SmallVector<Constructable, 3>>;
10971097

10981098
TYPED_TEST_SUITE(SmallVectorReferenceInvalidationTest,
1099-
SmallVectorReferenceInvalidationTestTypes);
1099+
SmallVectorReferenceInvalidationTestTypes, );
11001100

11011101
TYPED_TEST(SmallVectorReferenceInvalidationTest, PushBack) {
11021102
// Note: setup adds [1, 2, ...] to V until it's at capacity in small mode.
@@ -1383,7 +1383,7 @@ using SmallVectorInternalReferenceInvalidationTestTypes =
13831383
SmallVector<std::pair<Constructable, Constructable>, 3>>;
13841384

13851385
TYPED_TEST_SUITE(SmallVectorInternalReferenceInvalidationTest,
1386-
SmallVectorInternalReferenceInvalidationTestTypes);
1386+
SmallVectorInternalReferenceInvalidationTestTypes, );
13871387

13881388
TYPED_TEST(SmallVectorInternalReferenceInvalidationTest, EmplaceBack) {
13891389
// Note: setup adds [1, 2, ...] to V until it's at capacity in small mode.

‎llvm/unittests/ADT/TinyPtrVectorTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class TinyPtrVectorTest : public testing::Test {
8383
typedef ::testing::Types<TinyPtrVector<int *>, TinyPtrVector<double *>,
8484
TinyPtrVector<PointerIntPair<int *, 1>>>
8585
TinyPtrVectorTestTypes;
86-
TYPED_TEST_SUITE(TinyPtrVectorTest, TinyPtrVectorTestTypes);
86+
TYPED_TEST_SUITE(TinyPtrVectorTest, TinyPtrVectorTestTypes, );
8787

8888
TYPED_TEST(TinyPtrVectorTest, EmptyTest) {
8989
this->expectValues(this->V, this->testArray(0));

‎llvm/unittests/IR/PatternMatch.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1641,7 +1641,7 @@ template <typename T> struct MutableConstTest : PatternMatchTest { };
16411641
typedef ::testing::Types<std::tuple<Value*, Instruction*>,
16421642
std::tuple<const Value*, const Instruction *>>
16431643
MutableConstTestTypes;
1644-
TYPED_TEST_SUITE(MutableConstTest, MutableConstTestTypes);
1644+
TYPED_TEST_SUITE(MutableConstTest, MutableConstTestTypes, );
16451645

16461646
TYPED_TEST(MutableConstTest, ICmp) {
16471647
auto &IRB = PatternMatchTest::IRB;

‎llvm/unittests/IR/ValueMapTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class ValueMapTest : public testing::Test {
3535
// Run everything on Value*, a subtype to make sure that casting works as
3636
// expected, and a const subtype to make sure we cast const correctly.
3737
typedef ::testing::Types<Value, Instruction, const Instruction> KeyTypes;
38-
TYPED_TEST_SUITE(ValueMapTest, KeyTypes);
38+
TYPED_TEST_SUITE(ValueMapTest, KeyTypes, );
3939

4040
TYPED_TEST(ValueMapTest, Null) {
4141
ValueMap<TypeParam*, int> VM1;

‎llvm/unittests/Support/MathExtrasTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ class OverflowTest : public ::testing::Test { };
483483
using OverflowTestTypes = ::testing::Types<signed char, short, int, long,
484484
long long>;
485485

486-
TYPED_TEST_SUITE(OverflowTest, OverflowTestTypes);
486+
TYPED_TEST_SUITE(OverflowTest, OverflowTestTypes, );
487487

488488
TYPED_TEST(OverflowTest, AddNoOverflow) {
489489
TypeParam Result;

‎llvm/unittests/XRay/FDRProducerConsumerTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,14 +208,14 @@ using RecordTypes =
208208
::testing::Types<NewBufferRecord, NewCPUIDRecord, TSCWrapRecord,
209209
WallclockRecord, CustomEventRecord, CallArgRecord,
210210
PIDRecord, FunctionRecord>;
211-
INSTANTIATE_TYPED_TEST_SUITE_P(Records, RoundTripTest, RecordTypes);
211+
INSTANTIATE_TYPED_TEST_SUITE_P(Records, RoundTripTest, RecordTypes, );
212212

213213
// For V5, we have two new types we're supporting.
214214
using RecordTypesV5 =
215215
::testing::Types<NewBufferRecord, NewCPUIDRecord, TSCWrapRecord,
216216
WallclockRecord, CustomEventRecordV5, TypedEventRecord,
217217
CallArgRecord, PIDRecord, FunctionRecord>;
218-
INSTANTIATE_TYPED_TEST_SUITE_P(Records, RoundTripTestV5, RecordTypesV5);
218+
INSTANTIATE_TYPED_TEST_SUITE_P(Records, RoundTripTestV5, RecordTypesV5, );
219219

220220
} // namespace
221221
} // namespace xray

‎llvm/unittests/XRay/FDRRecordPrinterTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ using FDRRecordTypes =
122122
NewCPUIDRecord, TSCWrapRecord, WallclockRecord,
123123
CustomEventRecord, CallArgRecord, BufferExtents,
124124
PIDRecord>;
125-
INSTANTIATE_TYPED_TEST_SUITE_P(Records, PrinterTest, FDRRecordTypes);
125+
INSTANTIATE_TYPED_TEST_SUITE_P(Records, PrinterTest, FDRRecordTypes, );
126126

127127
TEST(FDRRecordPrinterTest, WriteFunctionRecordEnter) {
128128
std::string Data;

‎llvm/unittests/XRay/GraphTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ typedef ::testing::Types<GraphT, const GraphT> GraphTestTypes;
5959
using VVT = typename GraphT::VertexValueType;
6060
using EVT = typename GraphT::EdgeValueType;
6161

62-
TYPED_TEST_SUITE(GraphTest, GraphTestTypes);
62+
TYPED_TEST_SUITE(GraphTest, GraphTestTypes, );
6363

6464
template <typename T> void graphVertexTester(T &G) {
6565
std::set<unsigned> V({1u, 2u, 3u, 4u, 5u, 6u});

0 commit comments

Comments
 (0)