From a18bbc7465e258b038bb238fcea8cb3ebeb38ae1 Mon Sep 17 00:00:00 2001 From: Derek Christ Date: Mon, 14 Aug 2023 10:38:36 +0200 Subject: [PATCH] Add the resource directory option to the json converter --- tests/tests_configuration/jsonconverter.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/tests_configuration/jsonconverter.cpp b/tests/tests_configuration/jsonconverter.cpp index 8f39999c..1fadba54 100644 --- a/tests/tests_configuration/jsonconverter.cpp +++ b/tests/tests_configuration/jsonconverter.cpp @@ -41,14 +41,18 @@ int main(int argc, char **argv) { - if (argc != 2) + if (argc < 2) { std::cerr << "Must specify a simulation json as single argument.\n"; return -1; } std::string pathToJson = argv[1]; - auto configuration = DRAMSys::Config::from_path(pathToJson); + std::string resourceDirectory = argc <= 2 ? DRAMSYS_RESOURCE_DIR : argv[2]; + + auto configuration = DRAMSys::Config::from_path(pathToJson, resourceDirectory); + + nlohmann::json json; json["simulation"] = configuration;