From f8dd09200f057b4d15cc5482569e33781d035070 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Thu, 3 Aug 2023 23:54:14 -0700
Subject: [PATCH 1/4] enable remaining core and structures tests

---
 test/gui.lua                       | 4 +++-
 test/structures/find.lua           | 1 +
 test/structures/misc.lua           | 2 ++
 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 ++
 8 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/test/gui.lua b/test/gui.lua
index 1550fc1de..ac350ea1b 100644
--- a/test/gui.lua
+++ b/test/gui.lua
@@ -1,3 +1,5 @@
+config.targets = 'core'
+
 function test.getCurViewscreen()
     local scr = dfhack.gui.getCurViewscreen()
     local scr2 = df.global.gview.view
@@ -18,7 +20,7 @@ function test.getViewscreenByType()
 
     local bad_type = df.viewscreen_titlest
     if scr._type == bad_type then
-        bad_type = df.viewscreen_optionst
+        bad_type = df.viewscreen_dwarfmodest
     end
     local scr_bad = dfhack.gui.getViewscreenByType(bad_type)
     expect.eq(scr_bad, nil)
diff --git a/test/structures/find.lua b/test/structures/find.lua
index c01f071e1..471220479 100644
--- a/test/structures/find.lua
+++ b/test/structures/find.lua
@@ -1,4 +1,5 @@
 config.mode = 'title'
+config.targets = 'core'
 
 local function clean_vec(vec)
     while #vec > 0 do
diff --git a/test/structures/misc.lua b/test/structures/misc.lua
index 5c9f41561..277457dfe 100644
--- a/test/structures/misc.lua
+++ b/test/structures/misc.lua
@@ -1,3 +1,5 @@
+config.targets = 'core'
+
 function test.overlappingGlobals()
     local globals = {}
     for name, _ in pairs(df.global) do
diff --git a/test/structures/other_vectors.lua b/test/structures/other_vectors.lua
index bfc6086a4..453ab1dca 100644
--- a/test/structures/other_vectors.lua
+++ b/test/structures/other_vectors.lua
@@ -1,3 +1,5 @@
+config.targets = 'core'
+
 function test.index_name()
     for _, k in ipairs(df.units_other_id) do
         expect.eq(df.global.world.units.other[k]._kind, 'container')
diff --git a/test/structures/primitive_refs.lua b/test/structures/primitive_refs.lua
index 74abd02b9..77049b673 100644
--- a/test/structures/primitive_refs.lua
+++ b/test/structures/primitive_refs.lua
@@ -1,3 +1,5 @@
+config.targets = 'core'
+
 utils = require('utils')
 
 function with_temp_ref(...)
diff --git a/test/structures/ref_target.lua b/test/structures/ref_target.lua
index b9c568805..56bfdbfc7 100644
--- a/test/structures/ref_target.lua
+++ b/test/structures/ref_target.lua
@@ -1,3 +1,5 @@
+config.targets = 'core'
+
 function test.get()
     dfhack.with_temp_object(df.unit:new(), function(unit)
         expect.eq(unit:_field('hist_figure_id').ref_target, df.historical_figure)
diff --git a/test/structures/types_meta.lua b/test/structures/types_meta.lua
index 212e9c7ed..5809960bf 100644
--- a/test/structures/types_meta.lua
+++ b/test/structures/types_meta.lua
@@ -1,3 +1,5 @@
+config.targets = 'core'
+
 function test.struct()
     expect.eq(df.coord._kind, 'struct-type')
     expect.eq(tostring(df.coord), '<type: coord>')
diff --git a/test/structures/unions.lua b/test/structures/unions.lua
index 714786a96..9e4c767db 100644
--- a/test/structures/unions.lua
+++ b/test/structures/unions.lua
@@ -1,3 +1,5 @@
+config.targets = 'core'
+
 local utils = require('utils')
 
 function test.unit_action_fields()

From a6de9a21fac2d5e0d9d23ce30c443eb2730a8f31 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Fri, 4 Aug 2023 01:35:51 -0700
Subject: [PATCH 2/4] enable most core tests

---
 library/lua/gui/widgets.lua            |  2 +-
 library/lua/helpdb.lua                 |  2 +-
 test/library/argparse.lua              |  2 ++
 test/library/gui.lua                   |  3 +++
 test/library/gui/dialogs.lua           |  2 ++
 test/library/gui/widgets.EditField.lua | 22 ++++++++++++----------
 test/library/gui/widgets.Label.lua     |  2 ++
 test/library/gui/widgets.Scrollbar.lua |  6 ++++--
 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                 |  4 +++-
 test/structures/misc.lua               |  5 +++--
 17 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 74d193025..e1b71d186 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -992,7 +992,7 @@ function Scrollbar:onInput(keys)
         return false
     end
 
-    if self.parent_view:getMousePos() then
+    if self.parent_view and self.parent_view:getMousePos() then
         if keys.CONTEXT_SCROLL_UP then
             self.on_scroll('up_small')
             return true
diff --git a/library/lua/helpdb.lua b/library/lua/helpdb.lua
index 4ce078a22..a4e75ff0c 100644
--- a/library/lua/helpdb.lua
+++ b/library/lua/helpdb.lua
@@ -789,7 +789,7 @@ function ls(filter_str, skip_tags, show_dev_commands, exclude_strs)
     end
     if not show_dev_commands then
         local dev_tags = {'dev', 'unavailable'}
-        if dfhack.getHideArmokTools() then
+        if filter_str ~= 'armok' and dfhack.getHideArmokTools() then
             table.insert(dev_tags, 'armok')
         end
         table.insert(excludes, {tag=dev_tags})
diff --git a/test/library/argparse.lua b/test/library/argparse.lua
index 5e85e6465..33891a834 100644
--- a/test/library/argparse.lua
+++ b/test/library/argparse.lua
@@ -1,3 +1,5 @@
+config.targets = 'core'
+
 local argparse = require('argparse')
 local guidm = require('gui.dwarfmode')
 
diff --git a/test/library/gui.lua b/test/library/gui.lua
index fe04614d6..af8b15b6d 100644
--- a/test/library/gui.lua
+++ b/test/library/gui.lua
@@ -1,3 +1,5 @@
+config.targets = 'core'
+
 local gui = require('gui')
 
 function test.getKeyDisplay()
@@ -10,6 +12,7 @@ end
 
 function test.clear_pen()
     expect.table_eq(gui.CLEAR_PEN, {
+        tile = df.global.init.texpos_border_interior,
         ch = string.byte(' '),
         fg = COLOR_BLACK,
         bg = COLOR_BLACK,
diff --git a/test/library/gui/dialogs.lua b/test/library/gui/dialogs.lua
index 0d3724c2e..4ee16027e 100644
--- a/test/library/gui/dialogs.lua
+++ b/test/library/gui/dialogs.lua
@@ -1,3 +1,5 @@
+--config.targets = 'core'
+
 local gui = require('gui')
 local function send_keys(...)
     local keys = {...}
diff --git a/test/library/gui/widgets.EditField.lua b/test/library/gui/widgets.EditField.lua
index 23558987b..eb35bb22c 100644
--- a/test/library/gui/widgets.EditField.lua
+++ b/test/library/gui/widgets.EditField.lua
@@ -1,3 +1,5 @@
+config.targets = 'core'
+
 local widgets = require('gui.widgets')
 
 function test.editfield_cursor()
@@ -20,18 +22,18 @@ function test.editfield_cursor()
     expect.eq('ones two threes', e.text)
     expect.eq(5, e.cursor)
 
-    e:onInput{CURSOR_LEFT=true}
+    e:onInput{KEYBOARD_CURSOR_LEFT=true}
     expect.eq(4, e.cursor)
-    e:onInput{CURSOR_RIGHT=true}
+    e:onInput{KEYBOARD_CURSOR_RIGHT=true}
     expect.eq(5, e.cursor)
-    e:onInput{A_CARE_MOVE_W=true}
-    expect.eq(1, e.cursor, 'interpret alt-left as home')
-    e:onInput{A_MOVE_E_DOWN=true}
-    expect.eq(6, e.cursor, 'interpret ctrl-right as goto beginning of next word')
-    e:onInput{A_CARE_MOVE_E=true}
-    expect.eq(16, e.cursor, 'interpret alt-right as end')
-    e:onInput{A_MOVE_W_DOWN=true}
-    expect.eq(9, e.cursor, 'interpret ctrl-left as goto end of previous word')
+    -- e:onInput{A_CARE_MOVE_W=true}
+    -- expect.eq(1, e.cursor, 'interpret alt-left as home') -- uncomment when we have a home key
+    e:onInput{CUSTOM_CTRL_F=true}
+    expect.eq(6, e.cursor, 'interpret Ctrl-f as goto beginning of next word')
+    e:onInput{CUSTOM_CTRL_E=true}
+    expect.eq(16, e.cursor, 'interpret Ctrl-e as end')
+    e:onInput{CUSTOM_CTRL_B=true}
+    expect.eq(9, e.cursor, 'interpret Ctrl-b as goto end of previous word')
 end
 
 function test.editfield_click()
diff --git a/test/library/gui/widgets.Label.lua b/test/library/gui/widgets.Label.lua
index 4693d3d0d..bb6e06235 100644
--- a/test/library/gui/widgets.Label.lua
+++ b/test/library/gui/widgets.Label.lua
@@ -1,3 +1,5 @@
+config.targets = '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 dbe033ba4..d1024a1cf 100644
--- a/test/library/gui/widgets.Scrollbar.lua
+++ b/test/library/gui/widgets.Scrollbar.lua
@@ -1,3 +1,5 @@
+config.targets = 'core'
+
 local gui = require('gui')
 local widgets = require('gui.widgets')
 
@@ -10,7 +12,7 @@ function test.update()
     expect.eq(1, s.elems_per_page)
     expect.eq(1, s.num_elems)
     expect.eq(0, s.bar_offset)
-    expect.eq(1, s.bar_height)
+    expect.eq(2, s.bar_height)
 
     -- top_elem, elems_per_page, num_elems
     s:update(1, 10, 0)
@@ -18,7 +20,7 @@ function test.update()
     expect.eq(10, s.elems_per_page)
     expect.eq(0, s.num_elems)
     expect.eq(0, s.bar_offset)
-    expect.eq(1, s.bar_height)
+    expect.eq(2, s.bar_height)
 
     -- first 10 of 50 shown
     s:update(1, 10, 50)
diff --git a/test/library/gui/widgets.lua b/test/library/gui/widgets.lua
index 51622e691..8f58076e6 100644
--- a/test/library/gui/widgets.lua
+++ b/test/library/gui/widgets.lua
@@ -1,3 +1,5 @@
+config.targets = 'core'
+
 local widgets = require('gui.widgets')
 
 function test.hotkeylabel_click()
diff --git a/test/library/helpdb.lua b/test/library/helpdb.lua
index 1f1e58ba9..29bc14f41 100644
--- a/test/library/helpdb.lua
+++ b/test/library/helpdb.lua
@@ -1,3 +1,5 @@
+config.targets = 'core'
+
 local h = require('helpdb')
 
 local mock_plugin_db = {
diff --git a/test/library/misc.lua b/test/library/misc.lua
index e746ec1a6..dd1dae2c6 100644
--- a/test/library/misc.lua
+++ b/test/library/misc.lua
@@ -1,5 +1,7 @@
 -- tests misc functions added by dfhack.lua
 
+config.targets = 'core'
+
 function test.safe_pairs()
     for k,v in safe_pairs(nil) do
         expect.fail('nil should not be iterable')
diff --git a/test/library/print.lua b/test/library/print.lua
index 3f9b5a78c..3a839168e 100644
--- a/test/library/print.lua
+++ b/test/library/print.lua
@@ -1,5 +1,7 @@
 -- tests print-related functions added by dfhack.lua
 
+config.targets = 'core'
+
 local dfhack = dfhack
 
 local mock_print = mock.func()
diff --git a/test/library/string.lua b/test/library/string.lua
index d22f262bf..8854fa21c 100644
--- a/test/library/string.lua
+++ b/test/library/string.lua
@@ -1,5 +1,7 @@
 -- tests string functions added by dfhack.lua
 
+config.targets = 'core'
+
 function test.startswith()
     expect.true_(('abcd'):startswith(''))
     expect.true_(('abcd'):startswith('abc'))
diff --git a/test/library/test_util/expect_unit.lua b/test/library/test_util/expect_unit.lua
index 1c3bd51e8..7f1fa3146 100644
--- a/test/library/test_util/expect_unit.lua
+++ b/test/library/test_util/expect_unit.lua
@@ -1,3 +1,5 @@
+config.targets = 'core'
+
 local expect_raw = require('test_util.expect')
 
 function test.str_find()
diff --git a/test/library/test_util/mock.lua b/test/library/test_util/mock.lua
index 1031a496a..93c24e160 100644
--- a/test/library/test_util/mock.lua
+++ b/test/library/test_util/mock.lua
@@ -1,3 +1,5 @@
+config.targets = 'core'
+
 local mock = require('test_util.mock')
 
 local test_table = {
diff --git a/test/library/utils.lua b/test/library/utils.lua
index cf2024618..c33e53a7f 100644
--- a/test/library/utils.lua
+++ b/test/library/utils.lua
@@ -1,3 +1,5 @@
+config.targets = 'core'
+
 local utils = require 'utils'
 
 function test.OrderedTable()
@@ -102,7 +104,7 @@ function test.df_expr_to_ref()
             expect.eq(df.reinterpret_cast(df.world, utils.df_expr_to_ref('unit[0]').value), df.global.world)
 
             expect.eq(utils.df_expr_to_ref('unit[1]'), utils.df_expr_to_ref('unit.1'))
-            expect.eq(df.reinterpret_cast(df.ui, utils.df_expr_to_ref('unit[1]').value), df.global.plotinfo)
+            expect.eq(df.reinterpret_cast(df.plotinfost, utils.df_expr_to_ref('unit[1]').value), df.global.plotinfo)
 
             expect.error_match('index out of bounds', function() utils.df_expr_to_ref('unit.2') end)
             expect.error_match('index out of bounds', function() utils.df_expr_to_ref('unit[2]') end)
diff --git a/test/structures/misc.lua b/test/structures/misc.lua
index 277457dfe..ebfe8edd4 100644
--- a/test/structures/misc.lua
+++ b/test/structures/misc.lua
@@ -1,8 +1,9 @@
-config.targets = 'core'
+-- TODO: fix crash in test.viewscreenDtors with viewscreen_legendsst
+--config.targets = 'core'
 
 function test.overlappingGlobals()
     local globals = {}
-    for name, _ in pairs(df.global) do
+    for name in pairs(df.global) do
         local gvar = df.global:_field(name)
         local size, addr = gvar:sizeof()
         table.insert(globals, {

From 4c89af7c20f0cf0f8fe6a4857f245a6eb974e11a Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Fri, 4 Aug 2023 09:59:08 -0700
Subject: [PATCH 3/4] 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)

From d93bf65115e431ea16f3c90584d79e75bc59dab5 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Fri, 4 Aug 2023 10:25:49 -0700
Subject: [PATCH 4/4] fix typo

---
 ci/test.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/test.lua b/ci/test.lua
index 81ed19344..de9389b00 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.target) == table and env.config.target or {env.config.target}
+    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