Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9df50c66 authored by Jim Pollock's avatar Jim Pollock
Browse files

vts: remove deprecated gtest macros 

INSTANTIATE_TEST_SUITE_P is the drop-in replacement for
INSTANTIATE_TEST_CASE_P and will enable uprev of gtest.

See
https://github.com/google/googletest/releases/tag/release-1.10.0 for
full context.

BUG=chromium:1091244
Test: mma within hardware/interfaces/neuralnetworks

Change-Id: Ibb44a06f3e9a682847d47f64676b3bb7afdde1d9
parent 4a916991

neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp

+7 −7
Original line number Diff line number Diff line
@@ -1209,7 +1209,7 @@ std::string printCompilationCachingTest( 
    return gtestCompliantName(getName(namedDevice) + "_" + type);

}



INSTANTIATE_TEST_CASE_P(TestCompilationCaching, CompilationCachingTest,

INSTANTIATE_TEST_SUITE_P(TestCompilationCaching, CompilationCachingTest,

                         testing::Combine(kNamedDeviceChoices, kOperandTypeChoices),

                         printCompilationCachingTest);
@@ -1365,7 +1365,7 @@ std::string printCompilationCachingSecurityTest( 
    return gtestCompliantName(getName(namedDevice) + "_" + type + "_" + std::to_string(seed));

}



INSTANTIATE_TEST_CASE_P(TestCompilationCaching, CompilationCachingSecurityTest,

INSTANTIATE_TEST_SUITE_P(TestCompilationCaching, CompilationCachingSecurityTest,

                         testing::Combine(kNamedDeviceChoices, kOperandTypeChoices,

                                          testing::Range(0U, 10U)),

                         printCompilationCachingSecurityTest);

neuralnetworks/1.3/vts/functional/CompilationCachingTests.cpp

+7 −7
Original line number Diff line number Diff line
@@ -1200,7 +1200,7 @@ std::string printCompilationCachingTest( 
    return gtestCompliantName(getName(namedDevice) + "_" + type);

}



INSTANTIATE_TEST_CASE_P(TestCompilationCaching, CompilationCachingTest,

INSTANTIATE_TEST_SUITE_P(TestCompilationCaching, CompilationCachingTest,

                         testing::Combine(kNamedDeviceChoices, kOperandTypeChoices),

                         printCompilationCachingTest);
@@ -1356,7 +1356,7 @@ std::string printCompilationCachingSecurityTest( 
    return gtestCompliantName(getName(namedDevice) + "_" + type + "_" + std::to_string(seed));

}



INSTANTIATE_TEST_CASE_P(TestCompilationCaching, CompilationCachingSecurityTest,

INSTANTIATE_TEST_SUITE_P(TestCompilationCaching, CompilationCachingSecurityTest,

                         testing::Combine(kNamedDeviceChoices, kOperandTypeChoices,

                                          testing::Range(0U, 10U)),

                         printCompilationCachingSecurityTest);

neuralnetworks/1.3/vts/functional/MemoryDomainTests.cpp

+10 −10
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ std::string printMemoryDomainAllocateTest( 
    return gtestCompliantName(getName(namedDevice) + "_" + type);

}



INSTANTIATE_TEST_CASE_P(TestMemoryDomain, MemoryDomainAllocateTest,

INSTANTIATE_TEST_SUITE_P(TestMemoryDomain, MemoryDomainAllocateTest,

                         testing::Combine(kNamedDeviceChoices, kTestOperandTypeChoices),

                         printMemoryDomainAllocateTest);
@@ -829,7 +829,7 @@ std::string printMemoryDomainCopyTest( 
    return gtestCompliantName(getName(namedDevice) + "_" + type);

}



INSTANTIATE_TEST_CASE_P(TestMemoryDomain, MemoryDomainCopyTest,

INSTANTIATE_TEST_SUITE_P(TestMemoryDomain, MemoryDomainCopyTest,

                         testing::Combine(kNamedDeviceChoices, kTestOperandTypeChoices),

                         printMemoryDomainCopyTest);
@@ -1195,7 +1195,7 @@ std::string printMemoryDomainExecutionTest( 
    return gtestCompliantName(getName(namedDevice) + "_" + type + "_" + executorStr);

}



INSTANTIATE_TEST_CASE_P(TestMemoryDomain, MemoryDomainExecutionTest,

INSTANTIATE_TEST_SUITE_P(TestMemoryDomain, MemoryDomainExecutionTest,

                         testing::Combine(kNamedDeviceChoices, kTestOperandTypeChoices,

                                          kExecutorChoices),

                         printMemoryDomainExecutionTest);