From b54cea35713e502236e0203fe274f2940e6a40f9 Mon Sep 17 00:00:00 2001 From: Chris Rackauckas Date: Sat, 11 Jul 2020 16:41:31 -0400 Subject: [PATCH 1/4] new test setup --- test/coloring_tests.jl | 3 ++- test/downstream/Project.toml | 1 + test/runtests.jl | 31 +++++++++++++++++++++++++++---- 3 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 test/downstream/Project.toml diff --git a/test/coloring_tests.jl b/test/coloring_tests.jl index 932cb17..76120c4 100644 --- a/test/coloring_tests.jl +++ b/test/coloring_tests.jl @@ -1,4 +1,5 @@ -using FiniteDiff, LinearAlgebra, SparseArrays, Test, LinearAlgebra, BlockBandedMatrices, ArrayInterface, BandedMatrices +using FiniteDiff, LinearAlgebra, SparseArrays, Test, LinearAlgebra, + BlockBandedMatrices, ArrayInterface, BandedMatrices fcalls = 0 function f(dx,x) diff --git a/test/downstream/Project.toml b/test/downstream/Project.toml new file mode 100644 index 0000000..103a228 --- /dev/null +++ b/test/downstream/Project.toml @@ -0,0 +1 @@ +OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" diff --git a/test/runtests.jl b/test/runtests.jl index 3346207..7dfd35b 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,7 +1,30 @@ -using FiniteDiff -using Test, LinearAlgebra +using Pkg +using SafeTestsets +const LONGER_TESTS = false + +const GROUP = get(ENV, "GROUP", "All") +const is_APPVEYOR = Sys.iswindows() && haskey(ENV,"APPVEYOR") + +function activate_downstream_env() + Pkg.activate("downstream") + Pkg.develop(PackageSpec(path=dirname(@__DIR__))) + Pkg.instantiate() +end @time begin - include("finitedifftests.jl") - include("coloring_tests.jl") + +if GROUP == "All" || GROUP == "Core" + @time @safetestset "FiniteDiff Standard Tests" begin include("finitedifftests.jl") end + @time @safetestset "Color Differentiation Tests" begin include("coloring_tests.jl") end + @time @safetestset "Out of Place Tests" begin include("out_of_place_tests.jl") end +end + +if GROUP == "All" || GROUP == "Downstream" + activate_downstream_env() + @time @safetestset "ODEs" begin + import OrdinaryDiffEq + include(joinpath(dirname(pathof(OrdinaryDiffEq)), "..", "test/interface/sparsedifftests.jl")) + end +end + end From 1548d53a1f1f6195152c61c447f02c485858d370 Mon Sep 17 00:00:00 2001 From: Chris Rackauckas Date: Sat, 11 Jul 2020 17:25:14 -0400 Subject: [PATCH 2/4] add some test deps --- .gitignore | 1 + Project.toml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8c960ec..3f02ca7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.jl.cov *.jl.*.cov *.jl.mem +Manifest.toml diff --git a/Project.toml b/Project.toml index d2db4bc..e78a74a 100644 --- a/Project.toml +++ b/Project.toml @@ -18,7 +18,9 @@ julia = "1.2" [extras] BandedMatrices = "aae01518-5342-5314-be14-df237901396f" BlockBandedMatrices = "ffab5731-97b5-5995-9138-79e8c1846df0" +Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" [targets] -test = ["Test", "BlockBandedMatrices", "BandedMatrices"] +test = ["Test", "BlockBandedMatrices", "BandedMatrices", "Pkg", "SafeTestsets"] From e5fe82761194964615f7df09a1f0c4545010c533 Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Sun, 12 Jul 2020 06:37:37 -0400 Subject: [PATCH 3/4] Update test/downstream/Project.toml Co-authored-by: Kanav Gupta <33966400+kanav99@users.noreply.github.com> --- test/downstream/Project.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/test/downstream/Project.toml b/test/downstream/Project.toml index 103a228..b28c55b 100644 --- a/test/downstream/Project.toml +++ b/test/downstream/Project.toml @@ -1 +1,2 @@ +[deps] OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" From 88aa50892b16e7b172b4c9448fd2009afe4f7c7c Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Sun, 12 Jul 2020 06:37:45 -0400 Subject: [PATCH 4/4] Update test/runtests.jl Co-authored-by: Kanav Gupta <33966400+kanav99@users.noreply.github.com> --- test/runtests.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/runtests.jl b/test/runtests.jl index 7dfd35b..d06abbb 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -23,7 +23,7 @@ if GROUP == "All" || GROUP == "Downstream" activate_downstream_env() @time @safetestset "ODEs" begin import OrdinaryDiffEq - include(joinpath(dirname(pathof(OrdinaryDiffEq)), "..", "test/interface/sparsedifftests.jl")) + include(joinpath(dirname(pathof(OrdinaryDiffEq)), "..", "test/interface/sparsediff_tests.jl")) end end