Merge pull request #74 from JuliaSmoothOptimizers/cleanup

Cleanup
JuliaSmoothOptimizers · Sep 12, 2016 · e15f54d · e15f54d
2 parents 58dc340 + 93f4bbf
commit e15f54d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/CUTEst.jl b/src/CUTEst.jl
@@ -45,7 +45,8 @@ end
 function __init__()
   global cutest_lib = C_NULL
   deps = joinpath(dirname(@__FILE__), "../deps")
-  include(joinpath(deps, "cutestenv.jl"))
+  cutestenv = joinpath(deps, "cutestenv.jl")
+  ispath(cutestenv) && include(cutestenv)
   global sifdecoderbin = joinpath(ENV["SIFDECODE"], "bin/sifdecoder")
 
   global libpath = joinpath(ENV["CUTEST"], "objects", ENV["MYARCH"],

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -10,7 +10,7 @@ end
 
 include("test_mpb.jl")
 
-problems = randsubseq(readdir(get(ENV, "MASTSIF", "") ), 0.05)
+problems = randsubseq(readdir(get(ENV, "MASTSIF", "") ), 0.01)
 
 for p in problems
   if !contains(p, "SIF")
@@ -55,3 +55,15 @@ cutest_finalize(nlp)
 nlp = CUTEstModel("DIXMAANJ", "-param", "M=30")
 @assert nlp.meta.nvar == 90
 cutest_finalize(nlp)
+
+# clean up the test directory
+here = dirname(@__FILE__)
+so_files = filter(x -> (ismatch(r".so$", x) || ismatch(r".dylib$", x)), readdir(here))
+
+for so_file in so_files
+  rm(joinpath(here, so_file))
+end
+
+rm(joinpath(here, "AUTOMAT.d"))
+rm(joinpath(here, "OUTSDIF.d"))
+