Fix testing subdirs (#261)

Author: mtfishman

Project.toml

@@ -1,7 +1,7 @@
 name = "ITensorNetworks"
 uuid = "2919e153-833c-4bdc-8836-1ea460a35fc7"
 authors = ["Matthew Fishman <[email protected]>, Joseph Tindall <[email protected]> and contributors"]
-version = "0.15.1"
+version = "0.15.2"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

src/ITensorNetworks.jl

@@ -65,7 +65,6 @@ include("solvers/operator_map.jl")
 include("solvers/abstract_problem.jl")
 include("solvers/eigsolve.jl")
 include("solvers/applyexp.jl")
-include("solvers/fitting.jl")
 
 include("apply.jl")
 include("inner.jl")

src/solvers/fitting.jl

@@ -7,39 +7,42 @@ const pat = r"(?:--group=)(\w+)"
 arg_id = findfirst(contains(pat), ARGS)
 const GROUP = uppercase(
     if isnothing(arg_id)
-        get(ENV, "GROUP", "ALL")
+        arg = get(ENV, "GROUP", "ALL")
+        # For some reason `ENV["GROUP"]` is set to `""`
+        # when running via GitHub Actions, so handle that case:
+        arg == "" ? "ALL" : arg
     else
         only(match(pat, ARGS[arg_id]).captures)
     end,
 )
 
 "match files of the form `test_*.jl`, but exclude `*setup*.jl`"
-function istestfile(fn)
+function istestfile(path)
+    fn = basename(path)
     return endswith(fn, ".jl") && startswith(basename(fn), "test_") && !contains(fn, "setup")
 end
 "match files of the form `*.jl`, but exclude `*_notest.jl` and `*setup*.jl`"
-function isexamplefile(fn)
+function isexamplefile(path)
+    fn = basename(path)
     return endswith(fn, ".jl") && !endswith(fn, "_notest.jl") && !contains(fn, "setup")
 end
 
 @time begin
     # tests in groups based on folder structure
-    for testgroup in filter(f -> isdir(joinpath(@__DIR__, f)), readdir(@__DIR__))
-        if GROUP == "ALL" || GROUP == uppercase(testgroup)
-            groupdir = joinpath(@__DIR__, testgroup)
-            for file in filter(istestfile, readdir(groupdir))
-                filename = joinpath(groupdir, file)
-                @eval @safetestset $file begin
+    for testgroup in filter(isdir, readdir(@__DIR__; join = true))
+        if GROUP == "ALL" || GROUP == uppercase(basename(testgroup))
+            for filename in filter(istestfile, readdir(testgroup; join = true))
+                @eval @safetestset $(basename(filename)) begin
                     include($filename)
                 end
             end
         end
     end
 
     # single files in top folder
-    for file in filter(istestfile, readdir(@__DIR__))
-        (file == basename(@__FILE__)) && continue # exclude this file to avoid infinite recursion
-        @eval @safetestset $file begin
+    for file in filter(istestfile, readdir(@__DIR__; join = true))
+        (basename(file) == basename(@__FILE__)) && continue # exclude this file to avoid infinite recursion
+        @eval @safetestset $(basename(file)) begin
             include($file)
         end
     end