IVGCVSW-3538 Fix Android driver getCapabilities_1_2() test
Signed-off-by: Ferran Balaguer <ferran.balaguer@arm.com>
Change-Id: Idca10ca2d55ae8d5ff95af8bdbbee5492d4a6af3
diff --git a/test/1.2/Capabilities.cpp b/test/1.2/Capabilities.cpp
index f414286..4424f9b 100644
--- a/test/1.2/Capabilities.cpp
+++ b/test/1.2/Capabilities.cpp
@@ -20,6 +20,18 @@
{
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 @@
__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 @@
BOOST_ASSERT(perfInfo.powerUsage == powerUsage);
}
-BOOST_AUTO_TEST_SUITE(CapabilitiesTests)
+BOOST_FIXTURE_TEST_SUITE(CapabilitiesTests, CapabilitiesFixture)
BOOST_AUTO_TEST_CASE(PerformanceCapabilitiesWithRuntime)
{