Skip to content

remove use of windows-2019 image in azure CI tests #1172

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
merged 4 commits into from
Jun 19, 2025
Merged

remove use of windows-2019 image in azure CI tests #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af3d0f2
remove use of windows-2019 image in azure CI tests
phlptp Jun 18, 2025
14f844f
add some more tests for coverage and a few more gaps in detecting int…
phlptp Jun 18, 2025
8ee1b1c
style: pre-commit.ci fixes
pre-commit-ci[bot] Jun 18, 2025
f58a38a
more test coverage
phlptp Jun 19, 2025
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
12 changes: 6 additions & 6 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
strategy:
matrix:
visual_studio_arm64:
vmImage: "windows-2022"
vmImage: "windows-2025"
cli11.std: 17
cli11.build_type: Debug
cli11.options: -G "Visual Studio 17 2022" -A ARM64
Expand Down Expand Up @@ -66,21 +66,21 @@ jobs:
cli11.std: 14
cli11.precompile: ON
Windows17:
vmImage: "windows-2019"
vmImage: "windows-2022"
cli11.std: 17
Windows17PC:
vmImage: "windows-2019"
vmImage: "windows-2022"
cli11.std: 17
cli11.precompile: ON
Windows11:
vmImage: "windows-2019"
vmImage: "windows-2022"
cli11.std: 11
Windows20:
vmImage: "windows-2022"
vmImage: "windows-2025"
cli11.std: 20
cli11.options: -DCMAKE_CXX_FLAGS="/EHsc"
WindowsLatest:
vmImage: "windows-2022"
vmImage: "windows-2025"
cli11.std: 23
cli11.options: -DCMAKE_CXX_FLAGS="/EHsc"
Linux17nortti:
Expand Down
10 changes: 10 additions & 0 deletions include/CLI/impl/App_inl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,12 @@ CLI11_INLINE Option *App::add_option(std::string option_name,
if(op != nullptr && op->get_configurable()) {
throw(OptionAlreadyAdded("added option matches existing option: --" + ln));
}
if(ln.size() == 1 || top_level_parent->get_allow_non_standard_option_names()) {
op = top_level_parent->get_option_no_throw("-" + ln);
if(op != nullptr && op->get_configurable()) {
throw(OptionAlreadyAdded("added option matches existing option: -" + ln));
}
}
}
for(auto &sn : myopt.snames_) {
const auto *op = top_level_parent->get_option_no_throw(sn);
Expand All @@ -216,6 +222,10 @@ CLI11_INLINE Option *App::add_option(std::string option_name,
if(op != nullptr && op->get_configurable()) {
throw(OptionAlreadyAdded("added option matches existing option: -" + sn));
}
op = top_level_parent->get_option_no_throw("--" + sn);
if(op != nullptr && op->get_configurable()) {
throw(OptionAlreadyAdded("added option matches existing option: --" + sn));
}
}
}
if(allow_non_standard_options_ && !myopt.snames_.empty()) {
Expand Down
6 changes: 6 additions & 0 deletions tests/OptionTypeTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,6 +951,12 @@ TEST_CASE_METHOD(TApp, "vectorEmptyArg", "[optiontype]") {
run();
CHECK(cv.size() == 2);
CHECK(cv[1] == "[]");

args = {"-c", "test1", "[[aa]]"};

run();
CHECK(cv.size() == 2);
CHECK(cv[1] == "[a]");
}

TEST_CASE_METHOD(TApp, "vectorDoubleArg", "[optiontype]") {
Expand Down
19 changes: 19 additions & 0 deletions tests/SubcommandTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1851,6 +1851,25 @@ TEST_CASE_METHOD(TApp, "subcommand_help", "[subcom]") {
CHECK(called);
}

TEST_CASE_METHOD(TApp, "DuplicateErrors", "[subcom]") {
app.allow_non_standard_option_names();
app.add_option("-t");
app.add_option("m");
app.add_option("--quit");
auto *sub1 = app.add_option_group("sub1");

CHECK_THROWS_AS(sub1->add_option("-t"), CLI::OptionAlreadyAdded);
CHECK_THROWS_AS(sub1->add_option("--t"), CLI::OptionAlreadyAdded);
CHECK_THROWS_AS(sub1->add_option("t"), CLI::OptionAlreadyAdded);
CHECK_THROWS_AS(sub1->add_option("-m"), CLI::OptionAlreadyAdded);
CHECK_THROWS_AS(sub1->add_option("--m"), CLI::OptionAlreadyAdded);
CHECK_THROWS_AS(sub1->add_option("m"), CLI::OptionAlreadyAdded);
CHECK_THROWS_AS(sub1->add_option("quit"), CLI::OptionAlreadyAdded);
CHECK_THROWS_AS(sub1->add_option("--quit"), CLI::OptionAlreadyAdded);
sub1->allow_non_standard_option_names();
CHECK_THROWS_AS(sub1->add_option("-quit"), CLI::OptionAlreadyAdded);
}

TEST_CASE_METHOD(TApp, "AliasErrors", "[subcom]") {
auto *sub1 = app.add_subcommand("sub1");
auto *sub2 = app.add_subcommand("sub2");
Expand Down
Loading