Reorganize runtests to avoid initializing MPI twice.

JuliaSmoothOptimizers · Feb 13, 2015 · 99c23fe · 99c23fe
1 parent 8cf38fa
commit 99c23fe
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 31 deletions.
diff --git a/test/mumps_test.jl b/test/mumps_test.jl
@@ -1,14 +1,3 @@
-using Base.Test
-using MUMPS
-using MPI
-
-include("get_div_grad.jl");
-root = 0;
-
-# Initialize MPI.
-MPI.Init()
-comm = MPI.COMM_WORLD
-
 icntl = default_icntl[:];
 icntl[1] = 0;
 icntl[2] = 0;
@@ -82,7 +71,3 @@ x = solve(A, rhs, sym=mumps_unsymmetric);
 MPI.Barrier(comm);
 relres = norm(A * x - rhs) / norm(rhs);
 @test(relres <= 1.0e-12);
-
-MPI.Barrier(comm)
-MPI.Finalize()
-
diff --git a/test/mumps_test_complex.jl b/test/mumps_test_complex.jl
@@ -1,14 +1,3 @@
-using Base.Test
-using MUMPS
-using MPI
-
-include("get_div_grad.jl");
-root = 0;
-
-# Initialize MPI.
-MPI.Init()
-comm = MPI.COMM_WORLD
-
 icntl = default_icntl[:];
 icntl[1] = 0;
 icntl[2] = 0;
@@ -71,7 +60,7 @@ MPI.Barrier(comm)
 relres = zeros(nrhs)
 for i = 1 : nrhs
   relres[i] =  norm(A * x[:,i] - rhs[:,i]) / norm(rhs[:,i]);
-  @test(relres[i] <= 1.0e-12);
+  @test(relres[i] <= 1.0e-8);
 end
 
 # Test a mixed-type example
@@ -81,7 +70,3 @@ x = solve(A, rhs, sym=mumps_unsymmetric);
 MPI.Barrier(comm)
 relres = norm(A * x - rhs) / norm(rhs);
 @test(relres <= 1.0e-12);
-
-MPI.Barrier(comm)
-MPI.Finalize()
-
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,2 +1,17 @@
+using Base.Test
+using MUMPS
+using MPI
+
+include("get_div_grad.jl");
+root = 0;
+
+# Initialize MPI.
+MPI.Init()
+comm = MPI.COMM_WORLD
+
 include("mumps_test.jl")
 include("mumps_test_complex.jl")
+
+MPI.Barrier(comm)
+MPI.Finalize()
+