LLM inference in C/C++
C++ ggml
arg: try fixing test-args-parser randomly fails (#24826)
Xuan-Son Nguyen75f460ac289e
diff --git a/common/arg.cpp b/common/arg.cppindex a9b1a25b27..8f54b5c814 100644--- a/common/arg.cpp+++ b/common/arg.cpp@@ -924,8 +924,8 @@ static utf8_argv make_utf8_argv() {bool common_params_parse(int argc, char ** argv, common_params & params, llama_example ex, void(*print_usage)(int, char **)) {#ifdef _WIN32auto utf8 = make_utf8_argv();- if (!utf8.ptrs.empty()) {- argc = static_cast<int>(utf8.buf.size());+ // repair argv only when it matches the process command line+ if (static_cast<int>(utf8.buf.size()) == argc) {argv = utf8.ptrs.data();}#endif@@ -2897,7 +2897,7 @@ common_params_context common_params_parser_init(common_params & params, llama_exparams.server_tools = parse_csv_row(value);}).set_examples({LLAMA_EXAMPLE_SERVER}).set_env("LLAMA_ARG_TOOLS"));- add_opt(common_arg(+ add_opt(common_arg({"-ag", "--agent"},{"-no-ag", "--no-agent"},"whether to enable CORS proxy and all built-in tools - do not enable in untrusted environments (default: disabled)",diff --git a/tests/test-arg-parser.cpp b/tests/test-arg-parser.cppindex 0dd8422e73..e83ee85dd4 100644--- a/tests/test-arg-parser.cpp+++ b/tests/test-arg-parser.cpp@@ -10,7 +10,7 @@#undef NDEBUG#include <cassert>-int main(void) {+static void test(void) {common_params params;printf("test-arg-parser: make sure there is no duplicated arguments in any examples\n\n");@@ -210,3 +210,13 @@ int main(void) {printf("test-arg-parser: all tests OK\n\n");}++int main(void) {+ try {+ test();+ } catch (std::exception & e) {+ fprintf(stderr, "test-arg-parser: exception: %s\n", e.what());+ return 1;+ }+ return 0;+}