Skip to content

Commit 0e8e5d0

Browse files
authored
Merge branch 'Civitasv:master' into fix/presets_recursive_include
2 parents 0b6b024 + 16dfb08 commit 0e8e5d0

3 files changed

Lines changed: 10 additions & 2 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ require("cmake-tools").setup {
159159
start_insert = false, -- If you want to enter terminal with :startinsert upon using :CMakeRun
160160
focus = false, -- Focus on terminal when cmake task is launched.
161161
do_not_add_newline = false, -- Do not hit enter on the command inserted when using :CMakeRun, allowing a chance to review or modify the command before hitting enter.
162+
use_shell_alias = false, -- Hide the verbose command wrapper by using a shell alias, showing only the program's output (currently not supported on Windows)
162163
},
163164
},
164165
},

lua/cmake-tools/init.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,7 @@ function cmake.run_test(opt, callback)
11831183
return
11841184
end
11851185
if idx == 1 then
1186-
ctest.run(const.ctest_command, "'.*'", config:build_directory_path(), env, config, opt)
1186+
ctest.run(const.ctest_command, nil, config:build_directory_path(), env, config, opt)
11871187
else
11881188
ctest.run(
11891189
const.ctest_command,

lua/cmake-tools/test/ctest.lua

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,14 @@ function ctest.run(ctest_command, test_name, build_dir, env, config, opt)
3838
local cmd = ctest_command
3939
opt = opt or {}
4040

41-
local args = { "--test-dir", utils.transform_path(build_dir), "-R", test_name, opt.args }
41+
local args = { "--test-dir", utils.transform_path(build_dir) }
42+
if test_name then
43+
table.insert(args, "-R")
44+
table.insert(args, test_name)
45+
end
46+
if opt.args then
47+
table.insert(args, opt.args)
48+
end
4249
utils.run(cmd, config.env_script, env, args, config.cwd, config.runner, nil)
4350
end
4451

0 commit comments

Comments
 (0)