From 4c89af7c20f0cf0f8fe6a4857f245a6eb974e11a Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Fri, 4 Aug 2023 09:59:08 -0700 Subject: [PATCH] targets -> target --- ci/test.lua | 2 +- test/core.lua | 2 +- test/encoding.lua | 2 +- test/gui.lua | 2 +- test/library/argparse.lua | 2 +- test/library/gui.lua | 2 +- test/library/gui/dialogs.lua | 2 +- test/library/gui/widgets.EditField.lua | 2 +- test/library/gui/widgets.Label.lua | 2 +- test/library/gui/widgets.Scrollbar.lua | 2 +- test/library/gui/widgets.lua | 2 +- test/library/helpdb.lua | 2 +- test/library/misc.lua | 2 +- test/library/print.lua | 2 +- test/library/string.lua | 2 +- test/library/test_util/expect_unit.lua | 2 +- test/library/test_util/mock.lua | 2 +- test/library/utils.lua | 2 +- test/structures/find.lua | 2 +- test/structures/misc.lua | 3 +-- test/structures/other_vectors.lua | 2 +- test/structures/primitive_refs.lua | 2 +- test/structures/ref_target.lua | 2 +- test/structures/types_meta.lua | 2 +- test/structures/unions.lua | 2 +- test/test.lua | 2 +- 26 files changed, 26 insertions(+), 27 deletions(-) diff --git a/ci/test.lua b/ci/test.lua index 3f7f8c77b..81ed19344 100644 --- a/ci/test.lua +++ b/ci/test.lua @@ -379,7 +379,7 @@ local function load_tests(file, tests) dfhack.printerr('Skipping tests for unspecified target in ' .. file) return true -- TODO: change to false once existing tests have targets specified end - local targets = type(env.config.targets) == table and env.config.targets or {env.config.targets} + local targets = type(env.config.target) == table and env.config.target or {env.config.target} for _,target in ipairs(targets) do if target == 'core' then goto continue end if type(target) ~= 'string' or not helpdb.is_entry(target) or diff --git a/test/core.lua b/test/core.lua index 0d21fa38f..cc102984e 100644 --- a/test/core.lua +++ b/test/core.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' local function clean_path(p) -- todo: replace with dfhack.filesystem call? diff --git a/test/encoding.lua b/test/encoding.lua index afed4bf8b..7a81f0ec4 100644 --- a/test/encoding.lua +++ b/test/encoding.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' function test.toSearchNormalized() expect.eq(dfhack.toSearchNormalized(''), '') diff --git a/test/gui.lua b/test/gui.lua index ac350ea1b..6bbb34117 100644 --- a/test/gui.lua +++ b/test/gui.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' function test.getCurViewscreen() local scr = dfhack.gui.getCurViewscreen() diff --git a/test/library/argparse.lua b/test/library/argparse.lua index 33891a834..437f1ea2b 100644 --- a/test/library/argparse.lua +++ b/test/library/argparse.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' local argparse = require('argparse') local guidm = require('gui.dwarfmode') diff --git a/test/library/gui.lua b/test/library/gui.lua index af8b15b6d..80c91198c 100644 --- a/test/library/gui.lua +++ b/test/library/gui.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' local gui = require('gui') diff --git a/test/library/gui/dialogs.lua b/test/library/gui/dialogs.lua index 4ee16027e..524a8b144 100644 --- a/test/library/gui/dialogs.lua +++ b/test/library/gui/dialogs.lua @@ -1,4 +1,4 @@ ---config.targets = 'core' +--config.target = 'core' local gui = require('gui') local function send_keys(...) diff --git a/test/library/gui/widgets.EditField.lua b/test/library/gui/widgets.EditField.lua index eb35bb22c..88625a7bf 100644 --- a/test/library/gui/widgets.EditField.lua +++ b/test/library/gui/widgets.EditField.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' local widgets = require('gui.widgets') diff --git a/test/library/gui/widgets.Label.lua b/test/library/gui/widgets.Label.lua index bb6e06235..75acba490 100644 --- a/test/library/gui/widgets.Label.lua +++ b/test/library/gui/widgets.Label.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' local gui = require('gui') local widgets = require('gui.widgets') diff --git a/test/library/gui/widgets.Scrollbar.lua b/test/library/gui/widgets.Scrollbar.lua index d1024a1cf..548792b3d 100644 --- a/test/library/gui/widgets.Scrollbar.lua +++ b/test/library/gui/widgets.Scrollbar.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' local gui = require('gui') local widgets = require('gui.widgets') diff --git a/test/library/gui/widgets.lua b/test/library/gui/widgets.lua index 8f58076e6..88d3ac952 100644 --- a/test/library/gui/widgets.lua +++ b/test/library/gui/widgets.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' local widgets = require('gui.widgets') diff --git a/test/library/helpdb.lua b/test/library/helpdb.lua index 29bc14f41..bc482582c 100644 --- a/test/library/helpdb.lua +++ b/test/library/helpdb.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' local h = require('helpdb') diff --git a/test/library/misc.lua b/test/library/misc.lua index dd1dae2c6..58afed967 100644 --- a/test/library/misc.lua +++ b/test/library/misc.lua @@ -1,6 +1,6 @@ -- tests misc functions added by dfhack.lua -config.targets = 'core' +config.target = 'core' function test.safe_pairs() for k,v in safe_pairs(nil) do diff --git a/test/library/print.lua b/test/library/print.lua index 3a839168e..28a2e7037 100644 --- a/test/library/print.lua +++ b/test/library/print.lua @@ -1,6 +1,6 @@ -- tests print-related functions added by dfhack.lua -config.targets = 'core' +config.target = 'core' local dfhack = dfhack diff --git a/test/library/string.lua b/test/library/string.lua index 8854fa21c..f6374f652 100644 --- a/test/library/string.lua +++ b/test/library/string.lua @@ -1,6 +1,6 @@ -- tests string functions added by dfhack.lua -config.targets = 'core' +config.target = 'core' function test.startswith() expect.true_(('abcd'):startswith('')) diff --git a/test/library/test_util/expect_unit.lua b/test/library/test_util/expect_unit.lua index 7f1fa3146..320e49707 100644 --- a/test/library/test_util/expect_unit.lua +++ b/test/library/test_util/expect_unit.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' local expect_raw = require('test_util.expect') diff --git a/test/library/test_util/mock.lua b/test/library/test_util/mock.lua index 93c24e160..ce25e6e69 100644 --- a/test/library/test_util/mock.lua +++ b/test/library/test_util/mock.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' local mock = require('test_util.mock') diff --git a/test/library/utils.lua b/test/library/utils.lua index c33e53a7f..ac40bea1a 100644 --- a/test/library/utils.lua +++ b/test/library/utils.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' local utils = require 'utils' diff --git a/test/structures/find.lua b/test/structures/find.lua index 471220479..e93b2cc7f 100644 --- a/test/structures/find.lua +++ b/test/structures/find.lua @@ -1,5 +1,5 @@ config.mode = 'title' -config.targets = 'core' +config.target = 'core' local function clean_vec(vec) while #vec > 0 do diff --git a/test/structures/misc.lua b/test/structures/misc.lua index ebfe8edd4..e93491d66 100644 --- a/test/structures/misc.lua +++ b/test/structures/misc.lua @@ -1,5 +1,4 @@ --- TODO: fix crash in test.viewscreenDtors with viewscreen_legendsst ---config.targets = 'core' +config.target = 'core' function test.overlappingGlobals() local globals = {} diff --git a/test/structures/other_vectors.lua b/test/structures/other_vectors.lua index 453ab1dca..aea00c27c 100644 --- a/test/structures/other_vectors.lua +++ b/test/structures/other_vectors.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' function test.index_name() for _, k in ipairs(df.units_other_id) do diff --git a/test/structures/primitive_refs.lua b/test/structures/primitive_refs.lua index 77049b673..7bd7daf3c 100644 --- a/test/structures/primitive_refs.lua +++ b/test/structures/primitive_refs.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' utils = require('utils') diff --git a/test/structures/ref_target.lua b/test/structures/ref_target.lua index 56bfdbfc7..560a5e4f7 100644 --- a/test/structures/ref_target.lua +++ b/test/structures/ref_target.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' function test.get() dfhack.with_temp_object(df.unit:new(), function(unit) diff --git a/test/structures/types_meta.lua b/test/structures/types_meta.lua index 5809960bf..79395575f 100644 --- a/test/structures/types_meta.lua +++ b/test/structures/types_meta.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' function test.struct() expect.eq(df.coord._kind, 'struct-type') diff --git a/test/structures/unions.lua b/test/structures/unions.lua index 9e4c767db..a664506df 100644 --- a/test/structures/unions.lua +++ b/test/structures/unions.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' local utils = require('utils') diff --git a/test/test.lua b/test/test.lua index 679325d2e..fbad06003 100644 --- a/test/test.lua +++ b/test/test.lua @@ -1,4 +1,4 @@ -config.targets = 'core' +config.target = 'core' function test.internal_in_test() expect.true_(dfhack.internal.IN_TEST)