Remove some custom test macros.

Author: maleadt

lib/cudadrv/error.jl

@@ -3,18 +3,37 @@
 export CuError
 
 
+# an optional struct, used to represent e.g. optional error logs.
+# this is to make CuErrors with/without additional logs compare equal
+# (so that we can simply reuse `@test_throws CuError(code)`).
+struct Optional{T}
+    data::Union{Nothing,T}
+    Optional{T}(data::Union{Nothing,T}=nothing) where {T} = new{T}(data)
+end
+Base.getindex(s::Optional) = s.data
+function Base.isequal(a::Optional, b::Optional)
+    if a.data === nothing || b.data === nothing
+        return true
+    else
+        return isequal(a.data, b.data)
+    end
+end
+Base.convert(::Type{Optional{T}}, ::Nothing) where T = Optional{T}()
+Base.convert(::Type{Optional{T}}, x) where T = Optional{T}(convert(T, x))
+
+
 """
     CuError(code)
-    CuError(code, meta)
+    CuError(code, details)
 
-Create a CUDA error object with error code `code`. The optional `meta` parameter indicates
-whether extra information, such as error logs, is known.
+Create a CUDA error object with error code `code`. The optional `details` parameter
+indicates whether extra information, such as error logs, is known.
 """
 struct CuError <: Exception
     code::CUresult
-    meta::Any
+    details::Optional{String}
 
-    CuError(code, meta=nothing) = new(code, meta)
+    CuError(code, details=nothing) = new(code, details)
 end
 
 Base.convert(::Type{CUresult}, err::CuError) = err.code
@@ -63,9 +82,9 @@ function Base.showerror(io::IO, err::CuError)
         print(io, "CUDA error: $(description(err)) (code $(reinterpret(Int32, err.code)), $(name(err)))")
     end
 
-    if err.meta !== nothing
+    if err.details[] !== nothing
         print(io, "\n")
-        print(io, err.meta)
+        print(io, err.details[])
     end
 end
 

test/core/cudadrv.jl

@@ -705,7 +705,7 @@ let
     @test md != md2
 end
 
-@test_throws_cuerror CUDA.ERROR_INVALID_IMAGE CuModule("foobar")
+@test_throws CuError(CUDA.ERROR_INVALID_IMAGE) CuModule("foobar")
 
 @testset "globals" begin
     md = CuModuleFile(joinpath(@__DIR__, "ptx/global.ptx"))
@@ -735,7 +735,7 @@ end
     # TODO: test with valid object code
     # NOTE: apparently, on Windows cuLinkAddData! _does_ accept object data containing \0
     if !Sys.iswindows()
-        @test_throws_cuerror CUDA.ERROR_UNKNOWN add_data!(link, "vadd_parent", UInt8[0])
+        @test_throws CuError(CUDA.ERROR_UNKNOWN) add_data!(link, "vadd_parent", UInt8[0])
     end
 end
 
@@ -744,10 +744,12 @@ end
         .version 3.1
         .target sm_999
         .address_size 64"""
-    @test_throws_message contains("ptxas fatal") CuError CuModule(invalid_code)
+    @test_throws CuError(CUDA.ERROR_INVALID_PTX) CuModule(invalid_code)
+    @test_throws "ptxas fatal"                   CuModule(invalid_code)
 
     link = CuLink()
-    @test_throws_message contains("ptxas fatal") CuError add_data!(link, "dummy", invalid_code)
+    @test_throws CuError(CUDA.ERROR_INVALID_PTX) add_data!(link, "dummy", invalid_code)
+    @test_throws                                 "ptxas fatal" add_data!(link, "dummy", invalid_code)
 end
 
 let

test/core/utils.jl

@@ -1,26 +1,6 @@
 using BFloat16s: BFloat16
 import CUDA: cudaDataType
 
-@testset "test utilities" begin
-    mutable struct NoThrowTestSet <: Test.AbstractTestSet
-        results::Vector
-        NoThrowTestSet(desc) = new([])
-    end
-    Test.record(ts::NoThrowTestSet, t::Test.Result) = (push!(ts.results, t); t)
-    Test.finish(ts::NoThrowTestSet) = ts.results
-    fails = @testset NoThrowTestSet begin
-        # OK
-        @test_throws_cuerror CUDA.ERROR_UNKNOWN throw(CuError(CUDA.ERROR_UNKNOWN))
-        # Fail, wrong CuError
-        @test_throws_cuerror CUDA.ERROR_UNKNOWN throw(CuError(CUDA.ERROR_INVALID_VALUE))
-        # Fail, wrong Exception
-        @test_throws_cuerror CUDA.ERROR_UNKNOWN error()
-    end
-    @test isa(fails[1], Test.Pass)
-    @test isa(fails[2], Test.Fail)
-    @test isa(fails[3], Test.Fail)
-end
-
 @testset "@sync" begin
   t = Base.@elapsed ret = CUDA.@sync begin
     # TODO: do something that takes a while on the GPU

test/setup.jl

@@ -136,45 +136,6 @@ macro grab_output(ex)
     end
 end
 
-# variant on @test_throws that checks the CuError error code
-macro test_throws_cuerror(code, ex)
-    # generate a test only returning CuError if it is the correct one
-    test = quote
-        try
-            $(esc(ex))
-        catch err
-            isa(err, CuError) || rethrow()
-            err.code == $code || error("Wrong CuError: ", err.code, " instead of ", $code)
-            rethrow()
-        end
-    end
-
-    # now re-use @test_throws (which ties into @testset, etc)
-    quote
-        @test_throws CuError $test
-    end
-end
-
-# @test_throw, with additional testing for the exception message
-macro test_throws_message(f, typ, ex...)
-    @gensym msg
-    quote
-        $msg = ""
-        @test_throws $(esc(typ)) try
-            $(esc(ex...))
-        catch err
-            $msg = sprint(showerror, err)
-            rethrow()
-        end
-
-        if !$(esc(f))($msg)
-            # @test should return its result, but doesn't
-            @error "Failed to validate error message\n" * $msg
-        end
-        @test $(esc(f))($msg)
-    end
-end
-
 # Run some code on-device
 macro on_device(ex...)
     code = ex[end]