general/CLI11
2
0
Fork 0
mirror of https://github.com/CLIUtils/CLI11.git synced 2026-01-19 04:52:08 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Azure windows 2019 image is being deprecated, shift CI to windows-2022
and windows 2025 images
add tests for coverage and a few missing checks for duplication options.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
Philip Top
2025-06-18 20:19:28 -07:00
committed by GitHub
parent 26bb3f2e30
commit 13658df9e1
4 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
azure-pipelines.yml
View File

@@ -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
@@ -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:

10
include/CLI/impl/App_inl.hpp
View File

@@ -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);
@@ -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()) {

6
tests/OptionTypeTest.cpp
View File

@@ -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]") {

19
tests/SubcommandTest.cpp
View File

@@ -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");