Skip to content

Commit

Permalink
deleted rake tasks for 0.5 and added for 0.7, need to include stdlib …
Browse files Browse the repository at this point in the history
…packages for 0.7
  • Loading branch information
robertfeldt committed May 18, 2018
1 parent 6205352 commit 2d40677
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 17 deletions.
28 changes: 11 additions & 17 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ Lib = "BlackBoxOptim"
TestDir = "test"

# General parameters that the user can set from the command line.
Julia = ENV["minreps"] || "julia"
Julia05 = "julia05"
Julia = "julia"
Julia06 = "julia06"
Julia07 = "julia07"
MinReps = (ENV["minreps"] || 30).to_i
MaxReps = (ENV["maxreps"] || 1000).to_i
MaxRepTime = (ENV["maxreptime"] || 1.0).to_f
Expand All @@ -22,33 +22,28 @@ task :atest do
sh "#{BaseCommand} test/run_autotests.jl"
end

Command = "#{Julia} --color=yes -L src/BlackBoxOptim.jl"
Command05 = "#{Julia05} --color=yes -L src/BlackBoxOptim.jl"
Command06 = "#{Julia06} --depwarn=no --color=yes -L src/BlackBoxOptim.jl"
Command06 = "#{Julia06} --color=yes -L src/BlackBoxOptim.jl"
Command07 = "#{Julia07} --depwarn=no --color=yes -L src/BlackBoxOptim.jl"
Command = Command06

desc "Run normal (fast) tests"
task :runtest do
sh "#{Command} test/runtests.jl"
end

desc "Run normal (fast) tests on Julia 0.6"
task :runtest6 do
sh "#{Command06} test/runtests.jl"
end

desc "Run normal (fast) tests, while timing test execution"
task :timedruntest do
sh "#{Command} test/timedruntests.jl"
end

desc "Run normal (fast) tests on Julia 0.5"
task :runtest5 do
sh "#{Command05} test/runtests.jl"
desc "Run normal (fast) tests on Julia 0.7"
task :runtest7 do
sh "#{Command07} test/runtests.jl"
end

desc "Run normal (fast) tests on Julia 0.5, while timing test execution"
task :timedruntest5 do
sh "#{Command05} test/timedruntests.jl"
desc "Run normal (fast) tests on Julia 0.7, while timing test execution"
task :timedruntest7 do
sh "#{Command07} test/timedruntests.jl"
end

desc "Run slow tests"
Expand Down Expand Up @@ -98,7 +93,6 @@ end

task :at => :runalltest
task :st => :runslowtest

task :default => :runtest

def loc_of_files(files)
Expand Down
4 changes: 4 additions & 0 deletions src/BlackBoxOptim.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
__precompile__()

if VERSION > v"0.7.0-DEV.0"
using Random
end

module BlackBoxOptim

using Distributions, StatsBase, Compat
Expand Down

0 comments on commit 2d40677

Please sign in to comment.