OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[scudo] Fix test harness integration 

Explicitly specify the class name to avoid selecting the wrong Run function, and inherit from the correct Test parent

Differential Revision: https://reviews.llvm.org/D121854
This commit is contained in:
Dominic Chen 2022-03-16 13:45:24 -07:00
parent 7abd6837a0
commit 03e82d94fc
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler-rt/lib/scudo/standalone/tests/combined_test.cpp
View File

@ -118,7 +118,7 @@ template <typename T> using ScudoCombinedDeathTest = ScudoCombinedTest<T>;
#define SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TYPE) \ #define SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TYPE) \
using FIXTURE##NAME##_##TYPE = FIXTURE##NAME<scudo::TYPE>; \ using FIXTURE##NAME##_##TYPE = FIXTURE##NAME<scudo::TYPE>; \
TEST_F(FIXTURE##NAME##_##TYPE, NAME) { Run(); } TEST_F(FIXTURE##NAME##_##TYPE, NAME) { FIXTURE##NAME<scudo::TYPE>::Run(); }
#define SCUDO_TYPED_TEST(FIXTURE, NAME) \ #define SCUDO_TYPED_TEST(FIXTURE, NAME) \
template <class TypeParam> \ template <class TypeParam> \

2
compiler-rt/lib/scudo/standalone/tests/memtag_test.cpp
View File

@ -38,7 +38,7 @@ TEST(MemtagBasicDeathTest, Unsupported) {
EXPECT_DEATH(addFixedTag(nullptr, 0), "not supported"); EXPECT_DEATH(addFixedTag(nullptr, 0), "not supported");
} }
class MemtagTest : public ::testing::Test { class MemtagTest : public Test {
protected: protected:
void SetUp() override { void SetUp() override {
if (!archSupportsMemoryTagging() || !systemDetectsMemoryTagFaultsTestOnly()) if (!archSupportsMemoryTagging() || !systemDetectsMemoryTagFaultsTestOnly())

2
compiler-rt/lib/scudo/standalone/tests/primary_test.cpp
View File

@ -105,7 +105,7 @@ template <class BaseConfig> struct ScudoPrimaryTest : public Test {};
#define SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TYPE) \ #define SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TYPE) \
using FIXTURE##NAME##_##TYPE = FIXTURE##NAME<TYPE>; \ using FIXTURE##NAME##_##TYPE = FIXTURE##NAME<TYPE>; \
TEST_F(FIXTURE##NAME##_##TYPE, NAME) { Run(); } TEST_F(FIXTURE##NAME##_##TYPE, NAME) { FIXTURE##NAME<TYPE>::Run(); }
#define SCUDO_TYPED_TEST(FIXTURE, NAME) \ #define SCUDO_TYPED_TEST(FIXTURE, NAME) \
template <class TypeParam> \ template <class TypeParam> \