diff options
author | Éanna Ó Catháin <eanna.ocathain@arm.com> | 2020-04-27 12:54:11 +0100 |
---|---|---|
committer | Éanna Ó Catháin <eanna.ocathain@arm.com> | 2020-04-27 12:54:32 +0100 |
commit | 49c52a1e3be742cd7785ccc36c31cbbe495c4003 (patch) | |
tree | 5402a98f526a278192a8f27450bf31a1a7a8ed17 | |
parent | 0886ac4c403378ac0df85ab520a5db319be525a4 (diff) | |
download | armnn-49c52a1e3be742cd7785ccc36c31cbbe495c4003.tar.gz |
IVGCVSW-4728 Attempt to fix test failures
Change-Id: I0e0d4a8338c7df4f09518d9f84605b3cc002f2b0
Signed-off-by: Éanna Ó Catháin <eanna.ocathain@arm.com>
-rw-r--r-- | src/timelineDecoder/JSONTimelineDecoder.cpp | 7 | ||||
-rw-r--r-- | src/timelineDecoder/JSONTimelineDecoder.hpp | 7 | ||||
-rw-r--r-- | src/timelineDecoder/tests/JSONTimelineDecoderTests.cpp | 8 |
3 files changed, 16 insertions, 6 deletions
diff --git a/src/timelineDecoder/JSONTimelineDecoder.cpp b/src/timelineDecoder/JSONTimelineDecoder.cpp index 520995afe9..84472d8c99 100644 --- a/src/timelineDecoder/JSONTimelineDecoder.cpp +++ b/src/timelineDecoder/JSONTimelineDecoder.cpp @@ -8,6 +8,7 @@ #include <string> #include <fstream> +#include <boost/filesystem/fstream.hpp> namespace armnn { @@ -245,9 +246,9 @@ void JSONTimelineDecoder::JSONEntity::SetParent(JSONEntity& parent) void JSONTimelineDecoder::PrintJSON(JSONTimelineDecoder::JSONEntity& rootEntity) { std::string jsonString = GetJSONString(rootEntity); - std::ofstream outfile; - outfile.open(this->outputJSONFile); - outfile << jsonString; + boost::filesystem::ofstream ofs{this->outputJSONFile}; + ofs << jsonString; + ofs.close(); } std::string JSONTimelineDecoder::GetJSONString(JSONTimelineDecoder::JSONEntity& rootEntity) diff --git a/src/timelineDecoder/JSONTimelineDecoder.hpp b/src/timelineDecoder/JSONTimelineDecoder.hpp index 17ee84b679..c4e085587e 100644 --- a/src/timelineDecoder/JSONTimelineDecoder.hpp +++ b/src/timelineDecoder/JSONTimelineDecoder.hpp @@ -9,6 +9,8 @@ #include <map> #include <vector> +#include <boost/filesystem/path.hpp> +#include <boost/filesystem.hpp> namespace armnn { @@ -63,7 +65,10 @@ public: private: Model m_Model; - std::string outputJSONFile = "/tmp/output.json"; + boost::filesystem::path fileDir = boost::filesystem::temp_directory_path(); + boost::filesystem::path p{fileDir / boost::filesystem::unique_path("output.json")}; + + std::string outputJSONFile = p.string(); void HandleRetentionLink(const Relationship& relationship); void HandleLabelLink(const Relationship& relationship); diff --git a/src/timelineDecoder/tests/JSONTimelineDecoderTests.cpp b/src/timelineDecoder/tests/JSONTimelineDecoderTests.cpp index 71e76b1943..2d78564a2a 100644 --- a/src/timelineDecoder/tests/JSONTimelineDecoderTests.cpp +++ b/src/timelineDecoder/tests/JSONTimelineDecoderTests.cpp @@ -11,6 +11,7 @@ #include <boost/test/unit_test_suite.hpp> #include <fstream> +#include <boost/filesystem.hpp> BOOST_AUTO_TEST_SUITE(JSONTimelineDecoderTests) @@ -796,8 +797,11 @@ BOOST_AUTO_TEST_CASE(JSONTimelineDecoderTestJSON) timelineDecoder.PrintJSON(rootEntity); - std::ifstream inFile; - inFile.open("/tmp/output.json"); //open the input file + boost::filesystem::ifstream inFile; + boost::filesystem::path fileDir = boost::filesystem::temp_directory_path(); + boost::filesystem::path p{fileDir / boost::filesystem::unique_path("output.json")}; + + inFile.open(p); //open the input file std::stringstream strStream; strStream << inFile.rdbuf(); //read the file |