From 62a7b7feef36089ab3183431e392b17285b8c0bd Mon Sep 17 00:00:00 2001 From: Jared Smolens Date: Sat, 19 Mar 2022 05:42:27 +0000 Subject: Usability cleanup - Error check on missing test description file instead of throwing json exception - Removed outdated help option Signed-off-by: Jared Smolens Change-Id: Ia8780a88f4306af19ce63eaa679c84669f5c2ad9 --- reference_model/src/func_config.cc | 4 ++-- reference_model/src/main.cpp | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/reference_model/src/func_config.cc b/reference_model/src/func_config.cc index 6880829..a17fdef 100644 --- a/reference_model/src/func_config.cc +++ b/reference_model/src/func_config.cc @@ -1,5 +1,5 @@ -// Copyright (c) 2020, ARM Limited. +// Copyright (c) 2020-2022, ARM Limited. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -420,7 +420,7 @@ int func_model_print_help(FILE* out) fprintf(out, "TOSA Reference Model help\n\n"); fprintf(out, - "Usage: %s [-c] [-C ] [-d ] [-h] [-i ] [-l ] [-F " + "Usage: %s [-c] [-C ] [-d ] [-h] [-l ] [-F " "]\n", programname); fprintf(out, "\t-c - Print list of config options\n"); diff --git a/reference_model/src/main.cpp b/reference_model/src/main.cpp index 9a775fb..ae76cd5 100644 --- a/reference_model/src/main.cpp +++ b/reference_model/src/main.cpp @@ -1,5 +1,5 @@ -// Copyright (c) 2020, ARM Limited. +// Copyright (c) 2020-2022, ARM Limited. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -401,6 +401,11 @@ int initTestDesc(json& test_desc) return 1; } } + else + { + WARNING("Cannot open input file: %s", g_func_config.test_desc); + return 1; + } // Overwrite flatbuffer_dir/output_dir with dirname(g_func_config.test_desc) if it's not specified. std::string flatbuffer_dir_str(g_func_config.flatbuffer_dir); -- cgit v1.2.1