Fixup deps and use TestItemRunner on 1.6

Author: ToucheSir

test/Project.toml

@@ -4,14 +4,14 @@ Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
 Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
 ReTestItems = "817f1d60-ba6b-4fd5-9520-3cf149f6a823"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-TestItems = "1c621080-faea-4a02-84b6-bbd5e436b8fe"
+TestItemRunner = "f8b46487-2199-4994-9208-9a1283c18c0a"
 cuDNN = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd"
 
 [compat]
 CUDA = "4, 5"
 Flux = "0.13.16, 0.14"
 Images = "0.26"
-Test = "1"
-TestItems = "0.1"
 ReTestItems = "1"
+Test = "1"
+TestItemRunner = "0.2"
 cuDNN = "1"

test/runtests.jl

@@ -1,8 +1,21 @@
-using TestItems, ReTestItems
 using Metalhead: Metalhead
 
 # TODO account for GPU tests using name or tag filter
 # TODO write GPU tests!
-test_group = get(ENV, "GROUP", "All")
-name_filter = test_group == "All" ? nothing : Regex(test_group)
-ReTestItems.runtests(Metalhead; name = name_filter)
+const test_group = get(ENV, "GROUP", "All")
+const name_filter = test_group == "All" ? nothing : Regex(test_group)
+
+@static if VERSION >= v"1.7"
+    using ReTestItems
+    runtests(Metalhead; name = name_filter)
+else
+    using TestItemRunner
+    function testitem_filter(ti)
+        return name_filter === nothing || match(name_filter, ti.name) !== nothing
+    end
+end
+
+# Not sure why this needs to be split into a separate conditional...
+@static if VERSION < v"1.7"
+    @run_package_tests filter=testitem_filter
+end