Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 13:49:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "vts: remove deprecated gtest macros" am: fcd14d1824 am: c07a0bb942

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1394016

Change-Id: I8b0d4b85181b40d6b3ca29082d1aef9f83496416
This commit is contained in:
Treehugger Robot
2020-08-26 00:33:00 +00:00
committed by Automerger Merge Worker
parent 1d060bf086 c07a0bb942
commit 6135e28e4b
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp
View File

@@ -1209,9 +1209,9 @@ std::string printCompilationCachingTest(
return gtestCompliantName(getName(namedDevice) + "_" + type);
}
INSTANTIATE_TEST_CASE_P(TestCompilationCaching, CompilationCachingTest,
testing::Combine(kNamedDeviceChoices, kOperandTypeChoices),
printCompilationCachingTest);
INSTANTIATE_TEST_SUITE_P(TestCompilationCaching, CompilationCachingTest,
testing::Combine(kNamedDeviceChoices, kOperandTypeChoices),
printCompilationCachingTest);
using CompilationCachingSecurityTestParam = std::tuple<NamedDevice, OperandType, uint32_t>;
@@ -1365,9 +1365,9 @@ std::string printCompilationCachingSecurityTest(
return gtestCompliantName(getName(namedDevice) + "_" + type + "_" + std::to_string(seed));
}
INSTANTIATE_TEST_CASE_P(TestCompilationCaching, CompilationCachingSecurityTest,
testing::Combine(kNamedDeviceChoices, kOperandTypeChoices,
testing::Range(0U, 10U)),
printCompilationCachingSecurityTest);
INSTANTIATE_TEST_SUITE_P(TestCompilationCaching, CompilationCachingSecurityTest,
testing::Combine(kNamedDeviceChoices, kOperandTypeChoices,
testing::Range(0U, 10U)),
printCompilationCachingSecurityTest);
} // namespace android::hardware::neuralnetworks::V1_2::vts::functional

14
neuralnetworks/1.3/vts/functional/CompilationCachingTests.cpp
View File

@@ -1200,9 +1200,9 @@ std::string printCompilationCachingTest(
return gtestCompliantName(getName(namedDevice) + "_" + type);
}
INSTANTIATE_TEST_CASE_P(TestCompilationCaching, CompilationCachingTest,
testing::Combine(kNamedDeviceChoices, kOperandTypeChoices),
printCompilationCachingTest);
INSTANTIATE_TEST_SUITE_P(TestCompilationCaching, CompilationCachingTest,
testing::Combine(kNamedDeviceChoices, kOperandTypeChoices),
printCompilationCachingTest);
using CompilationCachingSecurityTestParam = std::tuple<NamedDevice, OperandType, uint32_t>;
@@ -1356,9 +1356,9 @@ std::string printCompilationCachingSecurityTest(
return gtestCompliantName(getName(namedDevice) + "_" + type + "_" + std::to_string(seed));
}
INSTANTIATE_TEST_CASE_P(TestCompilationCaching, CompilationCachingSecurityTest,
testing::Combine(kNamedDeviceChoices, kOperandTypeChoices,
testing::Range(0U, 10U)),
printCompilationCachingSecurityTest);
INSTANTIATE_TEST_SUITE_P(TestCompilationCaching, CompilationCachingSecurityTest,
testing::Combine(kNamedDeviceChoices, kOperandTypeChoices,
testing::Range(0U, 10U)),
printCompilationCachingSecurityTest);
} // namespace android::hardware::neuralnetworks::V1_3::vts::functional

20
neuralnetworks/1.3/vts/functional/MemoryDomainTests.cpp
View File

@@ -605,9 +605,9 @@ std::string printMemoryDomainAllocateTest(
return gtestCompliantName(getName(namedDevice) + "_" + type);
}
INSTANTIATE_TEST_CASE_P(TestMemoryDomain, MemoryDomainAllocateTest,
testing::Combine(kNamedDeviceChoices, kTestOperandTypeChoices),
printMemoryDomainAllocateTest);
INSTANTIATE_TEST_SUITE_P(TestMemoryDomain, MemoryDomainAllocateTest,
testing::Combine(kNamedDeviceChoices, kTestOperandTypeChoices),
printMemoryDomainAllocateTest);
class MemoryDomainCopyTestBase : public MemoryDomainTestBase {
protected:
@@ -829,9 +829,9 @@ std::string printMemoryDomainCopyTest(
return gtestCompliantName(getName(namedDevice) + "_" + type);
}
INSTANTIATE_TEST_CASE_P(TestMemoryDomain, MemoryDomainCopyTest,
testing::Combine(kNamedDeviceChoices, kTestOperandTypeChoices),
printMemoryDomainCopyTest);
INSTANTIATE_TEST_SUITE_P(TestMemoryDomain, MemoryDomainCopyTest,
testing::Combine(kNamedDeviceChoices, kTestOperandTypeChoices),
printMemoryDomainCopyTest);
using MemoryDomainExecutionTestParam = std::tuple<NamedDevice, TestOperandType, Executor>;
class MemoryDomainExecutionTest
@@ -1195,9 +1195,9 @@ std::string printMemoryDomainExecutionTest(
return gtestCompliantName(getName(namedDevice) + "_" + type + "_" + executorStr);
}
INSTANTIATE_TEST_CASE_P(TestMemoryDomain, MemoryDomainExecutionTest,
testing::Combine(kNamedDeviceChoices, kTestOperandTypeChoices,
kExecutorChoices),
printMemoryDomainExecutionTest);
INSTANTIATE_TEST_SUITE_P(TestMemoryDomain, MemoryDomainExecutionTest,
testing::Combine(kNamedDeviceChoices, kTestOperandTypeChoices,
kExecutorChoices),
printMemoryDomainExecutionTest);
} // namespace android::hardware::neuralnetworks::V1_3::vts::functional