From f060b2e5ad65554cc8b567fb016bbaf57f6aca05 Mon Sep 17 00:00:00 2001 From: Colm Donelan Date: Tue, 16 Jun 2020 17:14:51 +0100 Subject: MLCE-189 Adding more checks around dynamic backend directory paths. * It appears that the customer ends up with an invalid value of sharedObjectPath in GetBasePath. Inserting an explicit check for it. * Also checking the final derived path for the value dynamic backend shared object. Signed-off-by: Colm Donelan Change-Id: I8bee4ea8ac2a6b8ad846b9c958731718669455d4 --- src/backends/backendsCommon/test/DynamicBackendTests.hpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/backends/backendsCommon/test/DynamicBackendTests.hpp b/src/backends/backendsCommon/test/DynamicBackendTests.hpp index 0c24ec6f44..a2a6df0432 100644 --- a/src/backends/backendsCommon/test/DynamicBackendTests.hpp +++ b/src/backends/backendsCommon/test/DynamicBackendTests.hpp @@ -108,8 +108,8 @@ std::string GetBasePath(const std::string& basePath) path programLocation = boost::dll::program_location().parent_path(); path sharedObjectPath = programLocation.append(basePath); - BOOST_CHECK(exists(sharedObjectPath)); - + BOOST_CHECK_MESSAGE(exists(sharedObjectPath), "Base path for shared objects does not exist: " + + sharedObjectPath.string()); return sharedObjectPath.string(); } @@ -344,6 +344,11 @@ void CreateValidDynamicBackendObjectTestImpl() using namespace armnn; std::string testSubDirectory = GetTestSubDirectory(g_TestDynamicBackendSubDir); + + // We expect this path to exists so we can load a valid dynamic backend. + BOOST_CHECK_MESSAGE(boost::filesystem::exists(testSubDirectory), + "Base path for shared objects does not exist: " + testSubDirectory); + std::string sharedObjectFilePath = GetTestFilePath(testSubDirectory, g_TestValidTestDynamicBackendFileName); void* sharedObjectHandle = nullptr; -- cgit v1.2.1