@@ -830,8 +830,8 @@ function with_source_path(f, path)
830830end
831831
832832# Call `runtestsetup(ts, ...)` for each `ts::Testsetup` required by the given `TestItem`
833- # Return setup_name => module_name pairs
834- function runtestsetups (ti:: TestItem , ctx:: TestContext ; logs:: Symbol , force :: Bool = false )
833+ # Return `Dict` mapping ` setup_name::Symbol => module_name::Symbol`
834+ function runtestsetups (ti:: TestItem , ctx:: TestContext ; logs:: Symbol )
835835 # Initialse with the list of _requested_ setups, so that if it no setup by that name was
836836 # found when including files we return the setup name as the module name. Attempting to
837837 # import that name, like `using $setup`, will then throw an appropriate error.
@@ -847,16 +847,13 @@ end
847847# name of the `Module` (i.e. returns a `Symbol`).
848848# If the `TestSetup` has already been evaluated on this process and so is already in the
849849# `TestContext`, simply returns the `Module` name.
850- # Pass `force=true` to force the `TestSetup` to be re-evaluated, even if run before.
851- function runtestsetup (ts:: TestSetup , ctx:: TestContext ; logs:: Symbol , force:: Bool = false )
850+ function runtestsetup (ts:: TestSetup , ctx:: TestContext ; logs:: Symbol )
852851 mods = ctx. setups_evaled
853852 @lock mods. lock begin
854- if ! force
855- mod = get (mods. modules, ts. name, nothing )
856- if mod != = nothing
857- # we've eval-ed this module before, so just return the module name
858- return nameof (mod)
859- end
853+ mod = get (mods. modules, ts. name, nothing )
854+ if mod != = nothing
855+ # we've eval-ed this module before, so just return the module name
856+ return nameof (mod)
860857 end
861858 # We haven't eval-ed this module before, so we need to eval it.
862859 # In case the setup fails to eval, we discard its logs -- we will attempt to eval
0 commit comments