Skip to content

arg: try fixing test-args-parser randomly fails #24826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ngxson merged 9 commits into from
Jun 20, 2026
Merged

arg: try fixing test-args-parser randomly fails #24826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3215451
arg: try fixing test-args-parser randomly fails
ngxson Jun 19, 2026
754bd6b
return ref
ngxson Jun 19, 2026
30dbfa1
try triggering the workflow
ngxson Jun 19, 2026
7583029
exception wrapper
ngxson Jun 19, 2026
03679b5
wip
ngxson Jun 19, 2026
bb2c986
Merge branch 'master' into xsn/try_fix_test_args
ngxson Jun 19, 2026
1c17482
test
ngxson Jun 19, 2026
e2f65b7
test 2
ngxson Jun 19, 2026
c7c0bab
arg: guard win32 utf8 argv override
ServeurpersoCom Jun 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions common/arg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,8 +926,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 _WIN32
auto 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
Expand Down Expand Up @@ -2899,7 +2899,7 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
params.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)",
Expand Down
12 changes: 11 additions & 1 deletion tests/test-arg-parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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;
}
Loading