commit 6c8e8e7594604cca672486db224c1d041b39bfb9
author Matthew Bentham <matthew.bentham@arm.com> Tue Jan 15 17:57:00 2019 +0000
committer Matteo Martincigh <matteo.martincigh@arm.com> Wed Jan 16 15:41:55 2019 +0000
tree bb56e62bbc2411a96c2f770ed947ef057f3185b1
parent e5caff101efb25c4ecae05aed3bbb5eb733edb70

Github issue #120 - Embed TfLite schema

Change-Id: I57375375b2f3f59b89dbf45750f733bf25b5eb90

src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp

diff --git a/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp b/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp
index 676dc71..b372a60 100644
--- a/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp
+++ b/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include "Schema.hpp"
 #include <boost/filesystem.hpp>
 #include <boost/assert.hpp>
 #include <boost/format.hpp>
@@ -89,24 +90,12 @@
 
     bool ReadStringToBinary()
     {
-        const char* schemafileName = getenv("ARMNN_TF_LITE_SCHEMA_PATH");
-        if (schemafileName == nullptr)
-        {
-            schemafileName = ARMNN_TF_LITE_SCHEMA_PATH;
-        }
-        std::string schemafile;
-
-        bool ok = flatbuffers::LoadFile(schemafileName, false, &schemafile);
-        BOOST_ASSERT_MSG(ok, "Couldn't load schema file " ARMNN_TF_LITE_SCHEMA_PATH);
-        if (!ok)
-        {
-            return false;
-        }
+        std::string schemafile(&tflite_schema_start, &tflite_schema_end);
 
         // parse schema first, so we can use it to parse the data after
         flatbuffers::Parser parser;
 
-        ok &= parser.Parse(schemafile.c_str());
+        bool ok = parser.Parse(schemafile.c_str());
         BOOST_ASSERT_MSG(ok, "Failed to parse schema file");
 
         ok &= parser.Parse(m_JsonString.c_str());