Moving ctest extra args to Config.base_settings

Author: kalebealvs

lua/cmake-tools/config.lua

@@ -11,9 +11,6 @@ local Config = {
   build_directory = nil,
   query_directory = nil,
   reply_directory = nil,
-  ctest = {
-    extra_args = {},
-  },
   build_type = nil,
   variant = nil,
   build_target = nil,
@@ -29,6 +26,7 @@ local Config = {
     generate_options = {},
     build_options = {},
     show_disabled_build_presets = true,
+    ctest_extra_args = {},
   }, -- general config
   target_settings = {}, -- target specific config
   executor = nil,
@@ -52,7 +50,7 @@ function Config:new(const)
   obj.executor = const.cmake_executor
   obj.runner = const.cmake_runner
   for _, v in pairs(const.ctest_extra_args) do
-    table.insert(obj.ctest.extra_args, v)
+    table.insert(obj.base_settings.ctest_extra_args, v)
   end
   return obj
 end

lua/cmake-tools/test/ctest.lua

@@ -39,7 +39,7 @@ function ctest.run(ctest_command, test_name, build_dir, env, config, opt)
   opt = opt or {}
 
   local args = { "--test-dir", utils.transform_path(build_dir), "-R", test_name, opt.args }
-  for _, v in pairs(config.ctest.extra_args) do
+  for _, v in pairs(config.base_settings.ctest_extra_args) do
     table.insert(args, v)
   end
   utils.run(cmd, config.env_script, env, args, config.cwd, config.runner, nil)

tests/config_spec.lua

@@ -13,11 +13,11 @@ describe("Config", function()
   it("should parse user provided ctest arguments", function()
     local_const.ctest_extra_args = { "-j", "6" }
     local config = Config:new(local_const)
-    assert.are_same({ "-j", "6" }, config.ctest.extra_args)
+    assert.are_same({ "-j", "6" }, config.base_settings.ctest_extra_args)
   end)
 
   it("should parse user ctest empty arguments", function()
     local config = Config:new(const)
-    assert.are_same({}, config.ctest.extra_args)
+    assert.are_same({}, config.base_settings.ctest_extra_args)
   end)
 end)