Fix miscellaneous test errors

- arg and type changes for different Julia versions
- macOS error on fake_lang test
- skip test-for-warning on macOS

Author: timholy

.github/workflows/ci.yml

@@ -57,8 +57,11 @@ jobs:
           while !isdefined(Base, :active_repl_backend) sleep(0.1) end
           pushfirst!(Base.active_repl_backend.ast_transforms, Revise.revise_first)
           include(joinpath("test", "runtests.jl"))
-          REPL.eval_user_input(:(exit()), Base.active_repl_backend)
-        ' "Methods at REPL"
+          if Base.VERSION.major == 1 && Base.VERSION.minor >= 9
+              REPL.eval_user_input(:(exit()), Base.active_repl_backend, Main)
+          else
+              REPL.eval_user_input(:(exit()), Base.active_repl_backend)
+          end' "Methods at REPL"
         # Tests for out-of-process updates to manifest
         bash test/envs/use_exputils/setup.sh
         julia --project --code-coverage=user test/envs/use_exputils/switch_version.jl

test/non_jl_test.jl

@@ -36,7 +36,7 @@ try
     cp(joinpath(@__DIR__, "fake_lang", "test.program"), path, force=true)
     m=MyFile(path)
     includet(m)
-    Revise.revise()
+    yry()    # comes from test/common.jl
     @test fake_lang.y() == "2"
     @test fake_lang.x() == "1"
     cp(joinpath(@__DIR__, "fake_lang", "new_test.program"), path, force=true)

test/runtests.jl

@@ -3621,7 +3621,7 @@ GC.gc(); GC.gc()
             end
         end
         msg = Revise.watching_files[] ? "is not an existing file" : "is not an existing directory"
-        isempty(ARGS) && @test occursin(msg, read(warnfile, String))
+        isempty(ARGS) && !Sys.isapple() && @test occursin(msg, read(warnfile, String))
         rm(warnfile)
     end
 end

test/sigtest.jl

@@ -56,6 +56,11 @@ function extracttype(T)
     isa(p1, TypeVar) && return p1.ub
     error("unrecognized type ", T)
 end
+if isdefined(Core, :TypeofVararg)
+    istva(T) = isa(T, Core.TypeofVararg)
+else
+    istva(T) = false
+end
 function in_module_or_core(T, mod::Module)
     if isa(T, TypeVar)
         return in_module_or_core(T.ub, mod)
@@ -68,7 +73,7 @@ function in_module_or_core(T, mod::Module)
         in_module_or_core(T.a, mod) || return false
         return in_module_or_core(T.b, mod)
     end
-    if isa(T, Core.TypeofVararg)
+    if istva(T)
         isdefined(T, :T) || return true
         return in_module_or_core(T.T, mod)
     end