aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorFerran Balaguer <ferran.balaguer@arm.com>2019-07-25 13:47:52 +0100
committerÁron Virginás-Tar <aron.virginas-tar@arm.com>2019-07-25 13:17:11 +0000
commit3892a36f6005086318c7df3ec83d7babb6078430 (patch)
treef9f025cfe6d0ba8ac712d8e85bc67bb19496fbdc /test
parent4b86213422f59feed5295d9c568639cd37c875a9 (diff)
downloadandroid-nn-driver-3892a36f6005086318c7df3ec83d7babb6078430.tar.gz
IVGCVSW-3538 Fix Android driver getCapabilities_1_2() test
Signed-off-by: Ferran Balaguer <ferran.balaguer@arm.com> Change-Id: Idca10ca2d55ae8d5ff95af8bdbbee5492d4a6af3
Diffstat (limited to 'test')
-rw-r--r--test/1.2/Capabilities.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/test/1.2/Capabilities.cpp b/test/1.2/Capabilities.cpp
index f4142866..4424f9b0 100644
--- a/test/1.2/Capabilities.cpp
+++ b/test/1.2/Capabilities.cpp
@@ -20,6 +20,18 @@ struct CapabilitiesFixture
{
CapabilitiesFixture()
{
+ // CleanUp before the execution of each test
+ CleanUp();
+ }
+
+ ~CapabilitiesFixture()
+ {
+ // CleanUp after the execution of each test
+ CleanUp();
+ }
+
+ void CleanUp()
+ {
const char* nullStr = "";
__system_property_set("Armnn.operandTypeTensorFloat32Performance.execTime", nullStr);
@@ -39,8 +51,6 @@ struct CapabilitiesFixture
__system_property_set("Armnn.operandTypeInt32Performance.execTime", nullStr);
__system_property_set("Armnn.operandTypeInt32Performance.powerUsage", nullStr);
}
-
- ~CapabilitiesFixture(){}
};
void CheckOperandType(const V1_2::Capabilities& capabilities, OperandType type, float execTime, float powerUsage)
@@ -50,7 +60,7 @@ void CheckOperandType(const V1_2::Capabilities& capabilities, OperandType type,
BOOST_ASSERT(perfInfo.powerUsage == powerUsage);
}
-BOOST_AUTO_TEST_SUITE(CapabilitiesTests)
+BOOST_FIXTURE_TEST_SUITE(CapabilitiesTests, CapabilitiesFixture)
BOOST_AUTO_TEST_CASE(PerformanceCapabilitiesWithRuntime)
{