From d0d79630551693997f4e9475d0c753eae7789061 Mon Sep 17 00:00:00 2001 From: Valentin Churavy Date: Sat, 28 Jan 2017 15:26:24 +0900 Subject: [PATCH] remove BaseTestNext and bump Compat --- REQUIRE | 2 +- test/runtests.jl | 7 +------ test/unittest/bind.jl | 7 +------ test/unittest/io.jl | 7 +------ test/unittest/kvstore.jl | 7 +------ test/unittest/name.jl | 7 +------ test/unittest/ndarray.jl | 7 +------ test/unittest/operator.jl | 7 +------ test/unittest/random.jl | 7 +------ test/unittest/symbolic-node.jl | 7 +------ test/unittest/visualize.jl | 7 +------ 11 files changed, 11 insertions(+), 61 deletions(-) diff --git a/REQUIRE b/REQUIRE index 7812bc91c571..8fdfc5fcde96 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,5 +1,5 @@ julia 0.5 -Compat 0.9.1 +Compat 0.9.5 Formatting BinDeps JSON diff --git a/test/runtests.jl b/test/runtests.jl index 20125bc2b8cf..823830b54d0d 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,10 +1,5 @@ using MXNet -if VERSION ≥ v"0.5.0-dev+7720" - using Base.Test -else - using BaseTestNext - const Test = BaseTestNext -end +using Base.Test # run test in the whole directory, latest modified files # are run first, this makes waiting time shorter when writing diff --git a/test/unittest/bind.jl b/test/unittest/bind.jl index 592a51a9f101..79f639518487 100644 --- a/test/unittest/bind.jl +++ b/test/unittest/bind.jl @@ -1,11 +1,6 @@ module TestBind using MXNet -if VERSION ≥ v"0.5.0-dev+7720" - using Base.Test -else - using BaseTestNext - const Test = BaseTestNext -end +using Base.Test using ..Main: rand_dims, reldiff diff --git a/test/unittest/io.jl b/test/unittest/io.jl index 9978ea4ccbce..88d77bd3c16b 100644 --- a/test/unittest/io.jl +++ b/test/unittest/io.jl @@ -1,11 +1,6 @@ module TestIO using MXNet -if VERSION ≥ v"0.5.0-dev+7720" - using Base.Test -else - using BaseTestNext - const Test = BaseTestNext -end +using Base.Test using ..Main: rand_dims, reldiff diff --git a/test/unittest/kvstore.jl b/test/unittest/kvstore.jl index 9b7b0a4e4bb4..cf15f1a65f05 100644 --- a/test/unittest/kvstore.jl +++ b/test/unittest/kvstore.jl @@ -1,11 +1,6 @@ module TestKVStore using MXNet -if VERSION ≥ v"0.5.0-dev+7720" - using Base.Test -else - using BaseTestNext - const Test = BaseTestNext -end +using Base.Test using ..Main: rand_dims diff --git a/test/unittest/name.jl b/test/unittest/name.jl index 2df05f10b4f2..9287bf087074 100644 --- a/test/unittest/name.jl +++ b/test/unittest/name.jl @@ -1,11 +1,6 @@ module TestNameManager using MXNet -if VERSION ≥ v"0.5.0-dev+7720" - using Base.Test -else - using BaseTestNext - const Test = BaseTestNext -end +using Base.Test function test_default() info("NameManager::default") diff --git a/test/unittest/ndarray.jl b/test/unittest/ndarray.jl index 9b96861e0006..155f365d6ee8 100644 --- a/test/unittest/ndarray.jl +++ b/test/unittest/ndarray.jl @@ -1,11 +1,6 @@ module TestNDArray using MXNet -if VERSION ≥ v"0.5.0-dev+7720" - using Base.Test -else - using BaseTestNext - const Test = BaseTestNext -end +using Base.Test using ..Main: rand_dims, reldiff diff --git a/test/unittest/operator.jl b/test/unittest/operator.jl index e06d87e55c8f..76e51f4403f5 100644 --- a/test/unittest/operator.jl +++ b/test/unittest/operator.jl @@ -1,11 +1,6 @@ module TestOperator using MXNet -if VERSION ≥ v"0.5.0-dev+7720" - using Base.Test -else - using BaseTestNext - const Test = BaseTestNext -end +using Base.Test using ..Main: rand_dims, reldiff diff --git a/test/unittest/random.jl b/test/unittest/random.jl index ac023d7226c9..54d651482cd6 100644 --- a/test/unittest/random.jl +++ b/test/unittest/random.jl @@ -1,11 +1,6 @@ module TestRandom using MXNet -if VERSION ≥ v"0.5.0-dev+7720" - using Base.Test -else - using BaseTestNext - const Test = BaseTestNext -end +using Base.Test function test_uniform() dims = (100, 100, 2) diff --git a/test/unittest/symbolic-node.jl b/test/unittest/symbolic-node.jl index 573f541fbcd6..36f125cd728c 100644 --- a/test/unittest/symbolic-node.jl +++ b/test/unittest/symbolic-node.jl @@ -1,11 +1,6 @@ module TestSymbolicNode using MXNet -if VERSION ≥ v"0.5.0-dev+7720" - using Base.Test -else - using BaseTestNext - const Test = BaseTestNext -end +using Base.Test using ..Main: mlp2, reldiff diff --git a/test/unittest/visualize.jl b/test/unittest/visualize.jl index f8b9f2164aba..3bdaa12824d2 100644 --- a/test/unittest/visualize.jl +++ b/test/unittest/visualize.jl @@ -1,11 +1,6 @@ module TestVisualize using MXNet -if VERSION ≥ v"0.5.0-dev+7720" - using Base.Test -else - using BaseTestNext - const Test = BaseTestNext -end +using Base.Test using ..Main: mlp2