refactor: main runtests.jl file

Author: RomeoV

test/runtests.jl

@@ -1,4 +1,4 @@
-using ReTestItems, NonlinearSolve, Hwloc, InteractiveUtils, Pkg
+using ReTestItems, Hwloc, InteractiveUtils, Pkg
 
 @info sprint(InteractiveUtils.versioninfo)
 
@@ -28,59 +28,55 @@ const GROUP = lowercase(get_from_test_args_or_env("GROUP", "all"))
 # To re-enable: change condition to `true` or `VERSION < v"1.13"`
 const ENZYME_ENABLED = VERSION < v"1.12"
 
-function activate_trim_env!()
-    Pkg.activate(abspath(joinpath(dirname(@__FILE__), "trim")))
-    Pkg.instantiate()
-    return nothing
-end
+if GROUP != "trim"
+    using NonlinearSolve  # trimming uses NonlinearSolve from a custom environment
 
-const EXTRA_PKGS = Pkg.PackageSpec[]
-if GROUP == "all" || GROUP == "downstream"
-    push!(EXTRA_PKGS, Pkg.PackageSpec("ModelingToolkit"))
-    push!(EXTRA_PKGS, Pkg.PackageSpec("SymbolicIndexingInterface"))
-end
-if GROUP == "all" || GROUP == "nopre"
-    # Only add Enzyme for nopre group if not on prerelease Julia and if enabled
-    if isempty(VERSION.prerelease) && ENZYME_ENABLED
-        push!(EXTRA_PKGS, Pkg.PackageSpec("Enzyme"))
-        push!(EXTRA_PKGS, Pkg.PackageSpec("Mooncake"))
-        push!(EXTRA_PKGS, Pkg.PackageSpec("SciMLSensitivity"))
+    const EXTRA_PKGS = Pkg.PackageSpec[]
+    if GROUP == "all" || GROUP == "downstream"
+        push!(EXTRA_PKGS, Pkg.PackageSpec("ModelingToolkit"))
+        push!(EXTRA_PKGS, Pkg.PackageSpec("SymbolicIndexingInterface"))
     end
-end
-if GROUP == "all" || GROUP == "cuda"
-    # Only add CUDA for cuda group if not on prerelease Julia
-    if isempty(VERSION.prerelease)
-        push!(EXTRA_PKGS, Pkg.PackageSpec("CUDA"))
+    if GROUP == "all" || GROUP == "nopre"
+        # Only add Enzyme for nopre group if not on prerelease Julia and if enabled
+        if isempty(VERSION.prerelease) && ENZYME_ENABLED
+            push!(EXTRA_PKGS, Pkg.PackageSpec("Enzyme"))
+            push!(EXTRA_PKGS, Pkg.PackageSpec("Mooncake"))
+            push!(EXTRA_PKGS, Pkg.PackageSpec("SciMLSensitivity"))
+        end
     end
-end
-
-length(EXTRA_PKGS) ≥ 1 && Pkg.add(EXTRA_PKGS)
+    if GROUP == "all" || GROUP == "cuda"
+        # Only add CUDA for cuda group if not on prerelease Julia
+        if isempty(VERSION.prerelease)
+            push!(EXTRA_PKGS, Pkg.PackageSpec("CUDA"))
+        end
+    end
+    length(EXTRA_PKGS) ≥ 1 && Pkg.add(EXTRA_PKGS)
 
-# Use sequential execution for wrapper tests to avoid parallel initialization issues
-const RETESTITEMS_NWORKERS = if GROUP == "wrappers"
-    0  # Sequential execution for wrapper tests
-else
-    tmp = get(ENV, "RETESTITEMS_NWORKERS", "")
-    isempty(tmp) &&
-        (tmp = string(min(ifelse(Sys.iswindows(), 0, Hwloc.num_physical_cores()), 4)))
-    parse(Int, tmp)
-end
-const RETESTITEMS_NWORKER_THREADS = begin
-    tmp = get(ENV, "RETESTITEMS_NWORKER_THREADS", "")
-    isempty(tmp) &&
-        (tmp = string(max(Hwloc.num_virtual_cores() ÷ max(RETESTITEMS_NWORKERS, 1), 1)))
-    parse(Int, tmp)
-end
+    # Use sequential execution for wrapper tests to avoid parallel initialization issues
+    const RETESTITEMS_NWORKERS = if GROUP == "wrappers"
+        0  # Sequential execution for wrapper tests
+    else
+        tmp = get(ENV, "RETESTITEMS_NWORKERS", "")
+        isempty(tmp) &&
+            (tmp = string(min(ifelse(Sys.iswindows(), 0, Hwloc.num_physical_cores()), 4)))
+        parse(Int, tmp)
+    end
+    const RETESTITEMS_NWORKER_THREADS = begin
+        tmp = get(ENV, "RETESTITEMS_NWORKER_THREADS", "")
+        isempty(tmp) &&
+            (tmp = string(max(Hwloc.num_virtual_cores() ÷ max(RETESTITEMS_NWORKERS, 1), 1)))
+        parse(Int, tmp)
+    end
 
-@info "Running tests for group: $(GROUP) with $(RETESTITEMS_NWORKERS) workers"
+    @info "Running tests for group: $(GROUP) with $(RETESTITEMS_NWORKERS) workers"
 
-if GROUP != "trim"
     ReTestItems.runtests(
         NonlinearSolve; tags = (GROUP == "all" ? nothing : [Symbol(GROUP)]),
         nworkers = RETESTITEMS_NWORKERS, nworker_threads = RETESTITEMS_NWORKER_THREADS,
         testitem_timeout = 3600
     )
 elseif GROUP == "trim" && VERSION >= v"1.12.0-rc1"  # trimming has been introduced in julia 1.12
-    activate_trim_env!()
+    Pkg.activate(joinpath(dirname(@__FILE__), "trim"))
+    Pkg.instantiate()
     include("trim/runtests.jl")
 end