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

Commit 25058340 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "vts: remove deprecated gtest macros" am: fcd14d18 am: c07a0bb9 am: 6135e28e 

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

Change-Id: Ibc5c92b7c31cdbce72ffca214f4ab27e0352de3e
parents b08d8ec0 6135e28e

neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp

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

    return gtestCompliantName(getName(namedDevice) + "_" + type);

}

}





INSTANTIATE_TEST_CASE_P(TestCompilationCaching, CompilationCachingTest,

INSTANTIATE_TEST_SUITE_P(TestCompilationCaching, CompilationCachingTest,

                         testing::Combine(kNamedDeviceChoices, kOperandTypeChoices),

                         testing::Combine(kNamedDeviceChoices, kOperandTypeChoices),

                         printCompilationCachingTest);

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

    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::Combine(kNamedDeviceChoices, kOperandTypeChoices,

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

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

                         printCompilationCachingSecurityTest);

                         printCompilationCachingSecurityTest);

neuralnetworks/1.3/vts/functional/CompilationCachingTests.cpp

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

    return gtestCompliantName(getName(namedDevice) + "_" + type);

}

}





INSTANTIATE_TEST_CASE_P(TestCompilationCaching, CompilationCachingTest,

INSTANTIATE_TEST_SUITE_P(TestCompilationCaching, CompilationCachingTest,

                         testing::Combine(kNamedDeviceChoices, kOperandTypeChoices),

                         testing::Combine(kNamedDeviceChoices, kOperandTypeChoices),

                         printCompilationCachingTest);

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

    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::Combine(kNamedDeviceChoices, kOperandTypeChoices,

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

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

                         printCompilationCachingSecurityTest);

                         printCompilationCachingSecurityTest);

neuralnetworks/1.3/vts/functional/MemoryDomainTests.cpp

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

    return gtestCompliantName(getName(namedDevice) + "_" + type);

}

}





INSTANTIATE_TEST_CASE_P(TestMemoryDomain, MemoryDomainAllocateTest,

INSTANTIATE_TEST_SUITE_P(TestMemoryDomain, MemoryDomainAllocateTest,

                         testing::Combine(kNamedDeviceChoices, kTestOperandTypeChoices),

                         testing::Combine(kNamedDeviceChoices, kTestOperandTypeChoices),

                         printMemoryDomainAllocateTest);

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

    return gtestCompliantName(getName(namedDevice) + "_" + type);

}

}





INSTANTIATE_TEST_CASE_P(TestMemoryDomain, MemoryDomainCopyTest,

INSTANTIATE_TEST_SUITE_P(TestMemoryDomain, MemoryDomainCopyTest,

                         testing::Combine(kNamedDeviceChoices, kTestOperandTypeChoices),

                         testing::Combine(kNamedDeviceChoices, kTestOperandTypeChoices),

                         printMemoryDomainCopyTest);

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

    return gtestCompliantName(getName(namedDevice) + "_" + type + "_" + executorStr);

}

}





INSTANTIATE_TEST_CASE_P(TestMemoryDomain, MemoryDomainExecutionTest,

INSTANTIATE_TEST_SUITE_P(TestMemoryDomain, MemoryDomainExecutionTest,

                         testing::Combine(kNamedDeviceChoices, kTestOperandTypeChoices,

                         testing::Combine(kNamedDeviceChoices, kTestOperandTypeChoices,

                                          kExecutorChoices),

                                          kExecutorChoices),

                         printMemoryDomainExecutionTest);

                         printMemoryDomainExecutionTest);